Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 222307 Details for
Bug 308079
dev-games/irrlicht-1.7.1.ebuild Version bump (Update)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
The patch for demoMake. No changes are made to this
irrlicht-1.7.1-demoMake.patch (text/plain), 19.41 KB, created by
Peter Asplund
on 2010-03-06 16:35:22 UTC
(
hide
)
Description:
The patch for demoMake. No changes are made to this
Filename:
MIME Type:
Creator:
Peter Asplund
Created:
2010-03-06 16:35:22 UTC
Size:
19.41 KB
patch
obsolete
>--- examples/Demo/Makefile >+++ examples/Demo/Makefile >@@ -2,7 +2,7 @@ > Target = Demo > Sources = CDemo.cpp CMainMenu.cpp main.cpp > >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -Wall -O3 -ffast-math > > ifeq ($(HOSTTYPE), x86_64) >@@ -13,7 +13,7 @@ > > # target specific settings > all_linux: SYSTEM=Linux >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg > > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm >--- examples/14.Win32Window/Makefile >+++ examples/14.Win32Window/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/12.TerrainRendering/Makefile >+++ examples/12.TerrainRendering/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/11.PerPixelLighting/Makefile >+++ examples/11.PerPixelLighting/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/08.SpecialFX/Makefile >+++ examples/08.SpecialFX/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/06.2DGraphics/Makefile >+++ examples/06.2DGraphics/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/04.Movement/Makefile >+++ examples/04.Movement/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,14 +17,14 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > 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 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/16.Quake3MapShader/Makefile >+++ examples/16.Quake3MapShader/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/15.LoadIrrFile/Makefile >+++ examples/15.LoadIrrFile/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/02.Quake3Map/Makefile >+++ examples/02.Quake3Map/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,7 +17,7 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht > static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm >@@ -25,7 +25,7 @@ > static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc > static_win32 all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32 static_win32: > $(warning Building...) >--- examples/19.MouseAndJoystick/Makefile >+++ examples/19.MouseAndJoystick/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > #CXXFLAGS = -O3 -ffast-math > CXXFLAGS = -g -Wall > >@@ -17,14 +17,14 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > 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 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/13.RenderToTexture/Makefile >+++ examples/13.RenderToTexture/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/10.Shaders/Makefile >+++ examples/10.Shaders/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/09.Meshviewer/Makefile >+++ examples/09.Meshviewer/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/21.Quake3Explorer/Makefile >+++ examples/21.Quake3Explorer/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp sound.cpp q3factory.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > #CXXFLAGS = -O3 -ffast-math > CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/03.CustomSceneNode/Makefile >+++ examples/03.CustomSceneNode/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/20.ManagedLights/Makefile >+++ examples/20.ManagedLights/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > #CXXFLAGS = -O3 -ffast-math > CXXFLAGS = -g -Wall > >@@ -17,14 +17,14 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > 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 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/05.UserInterface/Makefile >+++ examples/05.UserInterface/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/01.HelloWorld/Makefile >+++ examples/01.HelloWorld/Makefile >@@ -7,9 +7,9 @@ > # List of source files, separated by spaces > Sources := main.cpp > # Path to Irrlicht directory, should contain include/ and lib/ >-IrrlichtHome := ../.. >+IrrlichtHome := /usr > # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems >-BinPath = ../../bin/$(SYSTEM) >+BinPath = ../../bin > > # general compiler settings (might need to be set when compiling the lib, too) > # preprocessor flags, e.g. defines and include paths >@@ -24,7 +24,7 @@ > #no changes necessary below this line > #### > >-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) >+CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS) > CXXFLAGS = $(USERCXXFLAGS) > LDFLAGS = $(USERLDFLAGS) > >@@ -32,8 +32,8 @@ > all: all_linux > > # target specific settings >-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht >-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 >+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht >+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg > all_linux clean_linux: SYSTEM=Linux > all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc > all_win32 clean_win32 static_win32: SUF=.exe >--- examples/18.SplitScreen/Makefile >+++ examples/18.SplitScreen/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...) >--- examples/07.Collision/Makefile >+++ examples/07.Collision/Makefile >@@ -5,7 +5,7 @@ > Sources = main.cpp > > # general compiler settings >-CPPFLAGS = -I../../include -I/usr/X11R6/include >+CPPFLAGS = -I/usr/include/irrlicht > CXXFLAGS = -O3 -ffast-math > #CXXFLAGS = -g -Wall > >@@ -17,13 +17,13 @@ > endif > > # target specific settings >-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 >+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng > all_linux clean_linux: SYSTEM=Linux > all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm > all_win32 clean_win32: SYSTEM=Win32-gcc > all_win32 clean_win32: SUF=.exe > # name of the binary - only valid for targets which set SYSTEM >-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) >+DESTPATH = ../../bin/$(Target)$(SUF) > > all_linux all_win32: > $(warning Building...)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 308079
:
222299
|
222301
|
222303
|
222305
| 222307