Skip to content

D
deprecated-irrlicht-mac
Commit 8e103273 authored by hybrid's avatar hybrid
Browse files
Options

Remove glu from Makefile. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@890 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 18f0aeba
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 38 deletions
examples/01.HelloWorld/Makefile
View file @ 8e103273
...@@ -17,15 +17,18 @@ LIBSELECT=64 ...@@ -17,15 +17,18 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux all_win32 static_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht
all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32 static_win32: SUF=.exe
all_win32 clean_win32: SUF=.exe static_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
all_win32: LDFLAGS += -lopengl32 -lm
static_win32: LDFLAGS += -lgdi32 -lwinspool -lcomdlg32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lopengl32
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
all_linux all_win32: all_linux all_win32 static_win32:
$(warning Building...) $(warning Building...)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS)
...@@ -35,4 +38,4 @@ clean: clean_linux clean_win32 ...@@ -35,4 +38,4 @@ clean: clean_linux clean_win32
clean_linux clean_win32: clean_linux clean_win32:
@$(RM) $(DESTPATH) @$(RM) $(DESTPATH)
.PHONY: all all_win32 clean clean_linux clean_win32 .PHONY: all all_win32 static_win32 clean clean_linux clean_win32
examples/02.Quake3Map/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/03.CustomSceneNode/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/04.Movement/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
......
examples/05.UserInterface/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/06.2DGraphics/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/07.Collision/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/08.SpecialFX/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/09.Meshviewer/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/10.Shaders/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/11.PerPixelLighting/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/12.TerrainRendering/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/13.RenderToTexture/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/14.Win32Window/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/15.LoadIrrFile/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/16.Quake3MapShader/Makefile
View file @ 8e103273
...@@ -17,9 +17,9 @@ LIBSELECT=64 ...@@ -17,9 +17,9 @@ LIBSELECT=64
endif endif
# target specific settings # target specific settings
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
all_linux clean_linux: SYSTEM=Linux all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32 clean_win32: SUF=.exe all_win32 clean_win32: SUF=.exe
# name of the binary - only valid for targets which set SYSTEM # name of the binary - only valid for targets which set SYSTEM
......
examples/Demo/Makefile
View file @ 8e103273
...@@ -13,10 +13,10 @@ all: all_linux ...@@ -13,10 +13,10 @@ all: all_linux
# target specific settings # target specific settings
all_linux: SYSTEM=Linux all_linux: SYSTEM=Linux
all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lXxf86vm -lXext -lX11
all_win32 clean_win32: SYSTEM=Win32-gcc all_win32 clean_win32: SYSTEM=Win32-gcc
all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
# if you enable sound add the proper library for linking # if you enable sound add the proper library for linking
#LDFLAGS += -lIrrKlang #LDFLAGS += -lIrrKlang
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment