| 1 |
hasufell 13/11/21 21:44:14 |
| 2 |
|
| 3 |
Added: irrlicht-1.8.1-gentoo.patch |
| 4 |
irrlicht-1.8.1-config.patch |
| 5 |
irrlicht-1.8.1-demoMake.patch |
| 6 |
Log: |
| 7 |
version bump wrt #492228 |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: irrlicht-1.8.1-gentoo.patch |
| 18 |
=================================================================== |
| 19 |
--- source/Irrlicht/Makefile |
| 20 |
+++ source/Irrlicht/Makefile |
| 21 |
@@ -46,11 +46,7 @@ |
| 22 |
IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o |
| 23 |
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o |
| 24 |
IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o |
| 25 |
-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o |
| 26 |
-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o |
| 27 |
-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o |
| 28 |
LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o |
| 29 |
-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o |
| 30 |
|
| 31 |
# Next variable is for additional scene nodes etc. of customized Irrlicht versions |
| 32 |
EXTRAOBJ = |
| 33 |
@@ -61,18 +57,16 @@ |
| 34 |
|
| 35 |
############### |
| 36 |
#Compiler flags |
| 37 |
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng |
| 38 |
+CXXINCS = -I../../include |
| 39 |
CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 |
| 40 |
-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing |
| 41 |
+CXXFLAGS += -Wall -fno-exceptions -fno-rtti |
| 42 |
ifndef NDEBUG |
| 43 |
-CXXFLAGS += -g -D_DEBUG |
| 44 |
-else |
| 45 |
-CXXFLAGS += -fexpensive-optimizations -O3 |
| 46 |
+CXXFLAGS += -D_DEBUG |
| 47 |
endif |
| 48 |
ifdef PROFILE |
| 49 |
CXXFLAGS += -pg |
| 50 |
endif |
| 51 |
-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES |
| 52 |
+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES |
| 53 |
|
| 54 |
sharedlib sharedlib_osx: CXXFLAGS += -fPIC |
| 55 |
sharedlib sharedlib_osx: CFLAGS += -fPIC |
| 56 |
@@ -88,7 +82,7 @@ |
| 57 |
LIB_PATH = ../../lib/$(SYSTEM) |
| 58 |
INSTALL_DIR = /usr/local/lib |
| 59 |
sharedlib install: SHARED_LIB = libIrrlicht.so |
| 60 |
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm |
| 61 |
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz |
| 62 |
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include |
| 63 |
|
| 64 |
#OSX specific options |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.1 dev-games/irrlicht/files/irrlicht-1.8.1-config.patch |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch?rev=1.1&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch?rev=1.1&content-type=text/plain |
| 72 |
|
| 73 |
Index: irrlicht-1.8.1-config.patch |
| 74 |
=================================================================== |
| 75 |
--- include/IrrCompileConfig.h |
| 76 |
+++ include/IrrCompileConfig.h |
| 77 |
@@ -245,7 +245,7 @@ |
| 78 |
//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. |
| 79 |
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. |
| 80 |
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ |
| 81 |
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
| 82 |
+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
| 83 |
#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ |
| 84 |
#undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ |
| 85 |
#endif |
| 86 |
@@ -261,7 +261,7 @@ |
| 87 |
//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. |
| 88 |
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. |
| 89 |
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ |
| 90 |
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_ |
| 91 |
+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ |
| 92 |
#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ |
| 93 |
#undef _IRR_USE_NON_SYSTEM_LIB_PNG_ |
| 94 |
#endif |
| 95 |
@@ -598,7 +598,7 @@ |
| 96 |
/** If this is commented out, Irrlicht will try to compile using the zlib |
| 97 |
installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is |
| 98 |
defined. */ |
| 99 |
-#define _IRR_USE_NON_SYSTEM_ZLIB_ |
| 100 |
+//#define _IRR_USE_NON_SYSTEM_ZLIB_ |
| 101 |
#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_ |
| 102 |
#undef _IRR_USE_NON_SYSTEM_ZLIB_ |
| 103 |
#endif |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.1 dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch?rev=1.1&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch?rev=1.1&content-type=text/plain |
| 111 |
|
| 112 |
Index: irrlicht-1.8.1-demoMake.patch |
| 113 |
=================================================================== |
| 114 |
--- examples/Demo/Makefile |
| 115 |
+++ examples/Demo/Makefile |
| 116 |
@@ -2,8 +2,9 @@ |
| 117 |
Target = Demo |
| 118 |
Sources = CDemo.cpp CMainMenu.cpp main.cpp |
| 119 |
|
| 120 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 121 |
-CXXFLAGS = -Wall -O3 -ffast-math |
| 122 |
+CXXFLAGS ?= -O3 |
| 123 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 124 |
+CXXFLAGS += -Wall -ffast-math |
| 125 |
|
| 126 |
ifeq ($(HOSTTYPE), x86_64) |
| 127 |
LIBSELECT=64 |
| 128 |
@@ -13,7 +14,7 @@ |
| 129 |
|
| 130 |
# target specific settings |
| 131 |
all_linux: SYSTEM=Linux |
| 132 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 133 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 134 |
|
| 135 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 136 |
all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm |
| 137 |
--- examples/14.Win32Window/Makefile |
| 138 |
+++ examples/14.Win32Window/Makefile |
| 139 |
@@ -5,8 +5,9 @@ |
| 140 |
Sources = main.cpp |
| 141 |
|
| 142 |
# general compiler settings |
| 143 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 144 |
-CXXFLAGS = -O3 -ffast-math |
| 145 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 146 |
+CXXFLAGS ?= -O3 |
| 147 |
+CXXFLAGS += -ffast-math |
| 148 |
#CXXFLAGS = -g -Wall |
| 149 |
|
| 150 |
#default target is Linux |
| 151 |
@@ -17,13 +18,13 @@ |
| 152 |
endif |
| 153 |
|
| 154 |
# target specific settings |
| 155 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 156 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 157 |
all_linux clean_linux: SYSTEM=Linux |
| 158 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 159 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 160 |
all_win32 clean_win32: SUF=.exe |
| 161 |
# name of the binary - only valid for targets which set SYSTEM |
| 162 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 163 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 164 |
|
| 165 |
all_linux all_win32: |
| 166 |
$(warning Building...) |
| 167 |
--- examples/12.TerrainRendering/Makefile |
| 168 |
+++ examples/12.TerrainRendering/Makefile |
| 169 |
@@ -5,8 +5,9 @@ |
| 170 |
Sources = main.cpp |
| 171 |
|
| 172 |
# general compiler settings |
| 173 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 174 |
-CXXFLAGS = -O3 -ffast-math |
| 175 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 176 |
+CXXFLAGS ?= -O3 |
| 177 |
+CXXFLAGS += -ffast-math |
| 178 |
#CXXFLAGS = -g -Wall |
| 179 |
|
| 180 |
#default target is Linux |
| 181 |
@@ -17,13 +18,13 @@ |
| 182 |
endif |
| 183 |
|
| 184 |
# target specific settings |
| 185 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 186 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 187 |
all_linux clean_linux: SYSTEM=Linux |
| 188 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 189 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 190 |
all_win32 clean_win32: SUF=.exe |
| 191 |
# name of the binary - only valid for targets which set SYSTEM |
| 192 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 193 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 194 |
|
| 195 |
all_linux all_win32: |
| 196 |
$(warning Building...) |
| 197 |
--- examples/11.PerPixelLighting/Makefile |
| 198 |
+++ examples/11.PerPixelLighting/Makefile |
| 199 |
@@ -5,8 +5,9 @@ |
| 200 |
Sources = main.cpp |
| 201 |
|
| 202 |
# general compiler settings |
| 203 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 204 |
-CXXFLAGS = -O3 -ffast-math |
| 205 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 206 |
+CXXFLAGS ?= -O3 |
| 207 |
+CXXFLAGS += -ffast-math |
| 208 |
#CXXFLAGS = -g -Wall |
| 209 |
|
| 210 |
#default target is Linux |
| 211 |
@@ -17,13 +18,13 @@ |
| 212 |
endif |
| 213 |
|
| 214 |
# target specific settings |
| 215 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 216 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 217 |
all_linux clean_linux: SYSTEM=Linux |
| 218 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 219 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 220 |
all_win32 clean_win32: SUF=.exe |
| 221 |
# name of the binary - only valid for targets which set SYSTEM |
| 222 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 223 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 224 |
|
| 225 |
all_linux all_win32: |
| 226 |
$(warning Building...) |
| 227 |
--- examples/08.SpecialFX/Makefile |
| 228 |
+++ examples/08.SpecialFX/Makefile |
| 229 |
@@ -5,8 +5,9 @@ |
| 230 |
Sources = main.cpp |
| 231 |
|
| 232 |
# general compiler settings |
| 233 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 234 |
-CXXFLAGS = -O3 -ffast-math |
| 235 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 236 |
+CXXFLAGS ?= -O3 |
| 237 |
+CXXFLAGS += -ffast-math |
| 238 |
#CXXFLAGS = -g -Wall |
| 239 |
|
| 240 |
#default target is Linux |
| 241 |
@@ -17,13 +18,13 @@ |
| 242 |
endif |
| 243 |
|
| 244 |
# target specific settings |
| 245 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 246 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 247 |
all_linux clean_linux: SYSTEM=Linux |
| 248 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 249 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 250 |
all_win32 clean_win32: SUF=.exe |
| 251 |
# name of the binary - only valid for targets which set SYSTEM |
| 252 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 253 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 254 |
|
| 255 |
all_linux all_win32: |
| 256 |
$(warning Building...) |
| 257 |
--- examples/06.2DGraphics/Makefile |
| 258 |
+++ examples/06.2DGraphics/Makefile |
| 259 |
@@ -5,8 +5,9 @@ |
| 260 |
Sources = main.cpp |
| 261 |
|
| 262 |
# general compiler settings |
| 263 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 264 |
-CXXFLAGS = -O3 -ffast-math |
| 265 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 266 |
+CXXFLAGS ?= -O3 |
| 267 |
+CXXFLAGS += -ffast-math |
| 268 |
#CXXFLAGS = -g -Wall |
| 269 |
|
| 270 |
#default target is Linux |
| 271 |
@@ -17,13 +18,13 @@ |
| 272 |
endif |
| 273 |
|
| 274 |
# target specific settings |
| 275 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 276 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 277 |
all_linux clean_linux: SYSTEM=Linux |
| 278 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 279 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 280 |
all_win32 clean_win32: SUF=.exe |
| 281 |
# name of the binary - only valid for targets which set SYSTEM |
| 282 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 283 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 284 |
|
| 285 |
all_linux all_win32: |
| 286 |
$(warning Building...) |
| 287 |
--- examples/04.Movement/Makefile |
| 288 |
+++ examples/04.Movement/Makefile |
| 289 |
@@ -5,8 +5,9 @@ |
| 290 |
Sources = main.cpp |
| 291 |
|
| 292 |
# general compiler settings |
| 293 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 294 |
-CXXFLAGS = -O3 -ffast-math |
| 295 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 296 |
+CXXFLAGS ?= -O3 |
| 297 |
+CXXFLAGS += -ffast-math |
| 298 |
#CXXFLAGS = -g -Wall |
| 299 |
|
| 300 |
#default target is Linux |
| 301 |
@@ -17,14 +18,14 @@ |
| 302 |
endif |
| 303 |
|
| 304 |
# target specific settings |
| 305 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 306 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 307 |
all_linux clean_linux: SYSTEM=Linux |
| 308 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 309 |
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL |
| 310 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 311 |
all_win32 clean_win32: SUF=.exe |
| 312 |
# name of the binary - only valid for targets which set SYSTEM |
| 313 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 314 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 315 |
|
| 316 |
all_linux all_win32: |
| 317 |
$(warning Building...) |
| 318 |
--- examples/16.Quake3MapShader/Makefile |
| 319 |
+++ examples/16.Quake3MapShader/Makefile |
| 320 |
@@ -5,8 +5,9 @@ |
| 321 |
Sources = main.cpp |
| 322 |
|
| 323 |
# general compiler settings |
| 324 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 325 |
-CXXFLAGS = -O3 -ffast-math |
| 326 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 327 |
+CXXFLAGS ?= -O3 |
| 328 |
+CXXFLAGS += -ffast-math |
| 329 |
#CXXFLAGS = -g -Wall |
| 330 |
|
| 331 |
#default target is Linux |
| 332 |
@@ -17,13 +18,13 @@ |
| 333 |
endif |
| 334 |
|
| 335 |
# target specific settings |
| 336 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 337 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 338 |
all_linux clean_linux: SYSTEM=Linux |
| 339 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 340 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 341 |
all_win32 clean_win32: SUF=.exe |
| 342 |
# name of the binary - only valid for targets which set SYSTEM |
| 343 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 344 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 345 |
|
| 346 |
all_linux all_win32: |
| 347 |
$(warning Building...) |
| 348 |
--- examples/15.LoadIrrFile/Makefile |
| 349 |
+++ examples/15.LoadIrrFile/Makefile |
| 350 |
@@ -5,8 +5,9 @@ |
| 351 |
Sources = main.cpp |
| 352 |
|
| 353 |
# general compiler settings |
| 354 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 355 |
-CXXFLAGS = -O3 -ffast-math |
| 356 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 357 |
+CXXFLAGS ?= -O3 |
| 358 |
+CXXFLAGS += -ffast-math |
| 359 |
#CXXFLAGS = -g -Wall |
| 360 |
|
| 361 |
#default target is Linux |
| 362 |
@@ -17,13 +18,13 @@ |
| 363 |
endif |
| 364 |
|
| 365 |
# target specific settings |
| 366 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 367 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 368 |
all_linux clean_linux: SYSTEM=Linux |
| 369 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 370 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 371 |
all_win32 clean_win32: SUF=.exe |
| 372 |
# name of the binary - only valid for targets which set SYSTEM |
| 373 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 374 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 375 |
|
| 376 |
all_linux all_win32: |
| 377 |
$(warning Building...) |
| 378 |
--- examples/02.Quake3Map/Makefile |
| 379 |
+++ examples/02.Quake3Map/Makefile |
| 380 |
@@ -5,8 +5,9 @@ |
| 381 |
Sources = main.cpp |
| 382 |
|
| 383 |
# general compiler settings |
| 384 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 385 |
-CXXFLAGS = -O3 -ffast-math |
| 386 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 387 |
+CXXFLAGS ?= -O3 |
| 388 |
+CXXFLAGS += -ffast-math |
| 389 |
#CXXFLAGS = -g -Wall |
| 390 |
|
| 391 |
#default target is Linux |
| 392 |
@@ -17,7 +18,7 @@ |
| 393 |
endif |
| 394 |
|
| 395 |
# target specific settings |
| 396 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 397 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 398 |
all_linux clean_linux: SYSTEM=Linux |
| 399 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht |
| 400 |
static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm |
| 401 |
@@ -25,7 +25,7 @@ |
| 402 |
static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc |
| 403 |
static_win32 all_win32 clean_win32: SUF=.exe |
| 404 |
# name of the binary - only valid for targets which set SYSTEM |
| 405 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 406 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 407 |
|
| 408 |
all_linux all_win32 static_win32: |
| 409 |
$(warning Building...) |
| 410 |
--- examples/19.MouseAndJoystick/Makefile |
| 411 |
+++ examples/19.MouseAndJoystick/Makefile |
| 412 |
@@ -5,9 +5,10 @@ |
| 413 |
Sources = main.cpp |
| 414 |
|
| 415 |
# general compiler settings |
| 416 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 417 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 418 |
#CXXFLAGS = -O3 -ffast-math |
| 419 |
-CXXFLAGS = -g -Wall |
| 420 |
+CXXFLAGS ?= -O3 |
| 421 |
+CXXFLAGS += -Wall |
| 422 |
|
| 423 |
#default target is Linux |
| 424 |
all: all_linux |
| 425 |
@@ -17,14 +18,14 @@ |
| 426 |
endif |
| 427 |
|
| 428 |
# target specific settings |
| 429 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 430 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 431 |
all_linux clean_linux: SYSTEM=Linux |
| 432 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 433 |
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL |
| 434 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 435 |
all_win32 clean_win32: SUF=.exe |
| 436 |
# name of the binary - only valid for targets which set SYSTEM |
| 437 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 438 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 439 |
|
| 440 |
all_linux all_win32: |
| 441 |
$(warning Building...) |
| 442 |
--- examples/13.RenderToTexture/Makefile |
| 443 |
+++ examples/13.RenderToTexture/Makefile |
| 444 |
@@ -5,8 +5,9 @@ |
| 445 |
Sources = main.cpp |
| 446 |
|
| 447 |
# general compiler settings |
| 448 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 449 |
-CXXFLAGS = -O3 -ffast-math |
| 450 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 451 |
+CXXFLAGS ?= -O3 |
| 452 |
+CXXFLAGS += -ffast-math |
| 453 |
#CXXFLAGS = -g -Wall |
| 454 |
|
| 455 |
#default target is Linux |
| 456 |
@@ -17,13 +18,13 @@ |
| 457 |
endif |
| 458 |
|
| 459 |
# target specific settings |
| 460 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 461 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 462 |
all_linux clean_linux: SYSTEM=Linux |
| 463 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 464 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 465 |
all_win32 clean_win32: SUF=.exe |
| 466 |
# name of the binary - only valid for targets which set SYSTEM |
| 467 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 468 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 469 |
|
| 470 |
all_linux all_win32: |
| 471 |
$(warning Building...) |
| 472 |
--- examples/10.Shaders/Makefile |
| 473 |
+++ examples/10.Shaders/Makefile |
| 474 |
@@ -5,8 +5,9 @@ |
| 475 |
Sources = main.cpp |
| 476 |
|
| 477 |
# general compiler settings |
| 478 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 479 |
-CXXFLAGS = -O3 -ffast-math |
| 480 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 481 |
+CXXFLAGS ?= -O3 |
| 482 |
+CXXFLAGS += -ffast-math |
| 483 |
#CXXFLAGS = -g -Wall |
| 484 |
|
| 485 |
#default target is Linux |
| 486 |
@@ -17,13 +18,13 @@ |
| 487 |
endif |
| 488 |
|
| 489 |
# target specific settings |
| 490 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 491 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 492 |
all_linux clean_linux: SYSTEM=Linux |
| 493 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 494 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 495 |
all_win32 clean_win32: SUF=.exe |
| 496 |
# name of the binary - only valid for targets which set SYSTEM |
| 497 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 498 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 499 |
|
| 500 |
all_linux all_win32: |
| 501 |
$(warning Building...) |
| 502 |
--- examples/09.Meshviewer/Makefile |
| 503 |
+++ examples/09.Meshviewer/Makefile |
| 504 |
@@ -5,8 +5,9 @@ |
| 505 |
Sources = main.cpp |
| 506 |
|
| 507 |
# general compiler settings |
| 508 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 509 |
-CXXFLAGS = -O3 -ffast-math |
| 510 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 511 |
+CXXFLAGS ?= -O3 |
| 512 |
+CXXFLAGS += -ffast-math |
| 513 |
#CXXFLAGS = -g -Wall |
| 514 |
|
| 515 |
#default target is Linux |
| 516 |
@@ -17,13 +18,13 @@ |
| 517 |
endif |
| 518 |
|
| 519 |
# target specific settings |
| 520 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 521 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 522 |
all_linux clean_linux: SYSTEM=Linux |
| 523 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 524 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 525 |
all_win32 clean_win32: SUF=.exe |
| 526 |
# name of the binary - only valid for targets which set SYSTEM |
| 527 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 528 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 529 |
|
| 530 |
all_linux all_win32: |
| 531 |
$(warning Building...) |
| 532 |
--- examples/21.Quake3Explorer/Makefile |
| 533 |
+++ examples/21.Quake3Explorer/Makefile |
| 534 |
@@ -5,9 +5,10 @@ |
| 535 |
Sources = main.cpp sound.cpp q3factory.cpp |
| 536 |
|
| 537 |
# general compiler settings |
| 538 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 539 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 540 |
#CXXFLAGS = -O3 -ffast-math |
| 541 |
+CXXFLAGS ?= -O3 |
| 542 |
-CXXFLAGS = -g -Wall |
| 543 |
+CXXFLAGS += -Wall |
| 544 |
|
| 545 |
#default target is Linux |
| 546 |
all: all_linux |
| 547 |
@@ -17,13 +18,13 @@ |
| 548 |
endif |
| 549 |
|
| 550 |
# target specific settings |
| 551 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 552 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 553 |
all_linux clean_linux: SYSTEM=Linux |
| 554 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 555 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 556 |
all_win32 clean_win32: SUF=.exe |
| 557 |
# name of the binary - only valid for targets which set SYSTEM |
| 558 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 559 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 560 |
|
| 561 |
all_linux all_win32: |
| 562 |
$(warning Building...) |
| 563 |
--- examples/03.CustomSceneNode/Makefile |
| 564 |
+++ examples/03.CustomSceneNode/Makefile |
| 565 |
@@ -5,8 +5,9 @@ |
| 566 |
Sources = main.cpp |
| 567 |
|
| 568 |
# general compiler settings |
| 569 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 570 |
-CXXFLAGS = -O3 -ffast-math |
| 571 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 572 |
+CXXFLAGS ?= -O3 |
| 573 |
+CXXFLAGS += -ffast-math |
| 574 |
#CXXFLAGS = -g -Wall |
| 575 |
|
| 576 |
#default target is Linux |
| 577 |
@@ -17,13 +18,13 @@ |
| 578 |
endif |
| 579 |
|
| 580 |
# target specific settings |
| 581 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 582 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 583 |
all_linux clean_linux: SYSTEM=Linux |
| 584 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 585 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 586 |
all_win32 clean_win32: SUF=.exe |
| 587 |
# name of the binary - only valid for targets which set SYSTEM |
| 588 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 589 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 590 |
|
| 591 |
all_linux all_win32: |
| 592 |
$(warning Building...) |
| 593 |
--- examples/20.ManagedLights/Makefile |
| 594 |
+++ examples/20.ManagedLights/Makefile |
| 595 |
@@ -5,9 +5,10 @@ |
| 596 |
Sources = main.cpp |
| 597 |
|
| 598 |
# general compiler settings |
| 599 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 600 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 601 |
#CXXFLAGS = -O3 -ffast-math |
| 602 |
+CXXFLAGS ?= -O3 |
| 603 |
-CXXFLAGS = -g -Wall |
| 604 |
+CXXFLAGS += -Wall |
| 605 |
|
| 606 |
#default target is Linux |
| 607 |
all: all_linux |
| 608 |
@@ -17,14 +18,14 @@ |
| 609 |
endif |
| 610 |
|
| 611 |
# target specific settings |
| 612 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 613 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 614 |
all_linux clean_linux: SYSTEM=Linux |
| 615 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 616 |
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL |
| 617 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 618 |
all_win32 clean_win32: SUF=.exe |
| 619 |
# name of the binary - only valid for targets which set SYSTEM |
| 620 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 621 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 622 |
|
| 623 |
all_linux all_win32: |
| 624 |
$(warning Building...) |
| 625 |
--- examples/05.UserInterface/Makefile |
| 626 |
+++ examples/05.UserInterface/Makefile |
| 627 |
@@ -5,8 +5,9 @@ |
| 628 |
Sources = main.cpp |
| 629 |
|
| 630 |
# general compiler settings |
| 631 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 632 |
-CXXFLAGS = -O3 -ffast-math |
| 633 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 634 |
+CXXFLAGS ?= -O3 |
| 635 |
+CXXFLAGS += -ffast-math |
| 636 |
#CXXFLAGS = -g -Wall |
| 637 |
|
| 638 |
#default target is Linux |
| 639 |
@@ -17,13 +18,13 @@ |
| 640 |
endif |
| 641 |
|
| 642 |
# target specific settings |
| 643 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 644 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 645 |
all_linux clean_linux: SYSTEM=Linux |
| 646 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 647 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 648 |
all_win32 clean_win32: SUF=.exe |
| 649 |
# name of the binary - only valid for targets which set SYSTEM |
| 650 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 651 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 652 |
|
| 653 |
all_linux all_win32: |
| 654 |
$(warning Building...) |
| 655 |
--- examples/01.HelloWorld/Makefile |
| 656 |
+++ examples/01.HelloWorld/Makefile |
| 657 |
@@ -7,15 +7,15 @@ |
| 658 |
# List of source files, separated by spaces |
| 659 |
Sources := main.cpp |
| 660 |
# Path to Irrlicht directory, should contain include/ and lib/ |
| 661 |
-IrrlichtHome := ../.. |
| 662 |
+IrrlichtHome := /usr |
| 663 |
# Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems |
| 664 |
-BinPath = ../../bin/$(SYSTEM) |
| 665 |
+BinPath = ../../bin |
| 666 |
|
| 667 |
# general compiler settings (might need to be set when compiling the lib, too) |
| 668 |
# preprocessor flags, e.g. defines and include paths |
| 669 |
USERCPPFLAGS = |
| 670 |
# compiler flags such as optimization flags |
| 671 |
-USERCXXFLAGS = -O3 -ffast-math |
| 672 |
+USERCXXFLAGS = -ffast-math |
| 673 |
#USERCXXFLAGS = -g -Wall |
| 674 |
# linker flags such as additional libraries and link paths |
| 675 |
USERLDFLAGS = |
| 676 |
@@ -24,16 +24,17 @@ |
| 677 |
#no changes necessary below this line |
| 678 |
#### |
| 679 |
|
| 680 |
-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) |
| 681 |
-CXXFLAGS = $(USERCXXFLAGS) |
| 682 |
-LDFLAGS = $(USERLDFLAGS) |
| 683 |
+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) |
| 684 |
+CXXFLAGS ?= -O3 |
| 685 |
+CXXFLAGS += $(USERCXXFLAGS) |
| 686 |
+LDFLAGS += $(USERLDFLAGS) |
| 687 |
|
| 688 |
#default target is Linux |
| 689 |
all: all_linux |
| 690 |
|
| 691 |
# target specific settings |
| 692 |
-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht |
| 693 |
-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 694 |
+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht |
| 695 |
+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 696 |
all_linux clean_linux: SYSTEM=Linux |
| 697 |
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc |
| 698 |
all_win32 clean_win32 static_win32: SUF=.exe |
| 699 |
--- examples/18.SplitScreen/Makefile |
| 700 |
+++ examples/18.SplitScreen/Makefile |
| 701 |
@@ -5,8 +5,9 @@ |
| 702 |
Sources = main.cpp |
| 703 |
|
| 704 |
# general compiler settings |
| 705 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 706 |
-CXXFLAGS = -O3 -ffast-math |
| 707 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 708 |
+CXXFLAGS ?= -O3 |
| 709 |
+CXXFLAGS += -ffast-math |
| 710 |
#CXXFLAGS = -g -Wall |
| 711 |
|
| 712 |
#default target is Linux |
| 713 |
@@ -17,13 +18,13 @@ |
| 714 |
endif |
| 715 |
|
| 716 |
# target specific settings |
| 717 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 718 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 719 |
all_linux clean_linux: SYSTEM=Linux |
| 720 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 721 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 722 |
all_win32 clean_win32: SUF=.exe |
| 723 |
# name of the binary - only valid for targets which set SYSTEM |
| 724 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 725 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 726 |
|
| 727 |
all_linux all_win32: |
| 728 |
$(warning Building...) |
| 729 |
--- examples/07.Collision/Makefile |
| 730 |
+++ examples/07.Collision/Makefile |
| 731 |
@@ -5,8 +5,9 @@ |
| 732 |
Sources = main.cpp |
| 733 |
|
| 734 |
# general compiler settings |
| 735 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 736 |
-CXXFLAGS = -O3 -ffast-math |
| 737 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 738 |
+CXXFLAGS ?= -O3 |
| 739 |
+CXXFLAGS += -ffast-math |
| 740 |
#CXXFLAGS = -g -Wall |
| 741 |
|
| 742 |
#default target is Linux |
| 743 |
@@ -17,13 +18,13 @@ |
| 744 |
endif |
| 745 |
|
| 746 |
# target specific settings |
| 747 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 748 |
+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 749 |
all_linux clean_linux: SYSTEM=Linux |
| 750 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 751 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 752 |
all_win32 clean_win32: SUF=.exe |
| 753 |
# name of the binary - only valid for targets which set SYSTEM |
| 754 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 755 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 756 |
|
| 757 |
all_linux all_win32: |
| 758 |
$(warning Building...) |
| 759 |
--- examples/24.CursorControl/Makefile |
| 760 |
+++ examples/24.CursorControl/Makefile |
| 761 |
@@ -7,15 +7,15 @@ |
| 762 |
# List of source files, separated by spaces |
| 763 |
Sources := main.cpp |
| 764 |
# Path to Irrlicht directory, should contain include/ and lib/ |
| 765 |
-IrrlichtHome := ../.. |
| 766 |
+IrrlichtHome := /usr |
| 767 |
# Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems |
| 768 |
-BinPath = ../../bin/$(SYSTEM) |
| 769 |
+BinPath = ../../bin |
| 770 |
|
| 771 |
# general compiler settings (might need to be set when compiling the lib, too) |
| 772 |
# preprocessor flags, e.g. defines and include paths |
| 773 |
USERCPPFLAGS = |
| 774 |
# compiler flags such as optimization flags |
| 775 |
-USERCXXFLAGS = -O3 -ffast-math |
| 776 |
+USERCXXFLAGS = -ffast-math |
| 777 |
#USERCXXFLAGS = -g -Wall |
| 778 |
# linker flags such as additional libraries and link paths |
| 779 |
USERLDFLAGS = |
| 780 |
@@ -24,16 +24,17 @@ |
| 781 |
#no changes necessary below this line |
| 782 |
#### |
| 783 |
|
| 784 |
-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) |
| 785 |
-CXXFLAGS = $(USERCXXFLAGS) |
| 786 |
-LDFLAGS = $(USERLDFLAGS) |
| 787 |
+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) |
| 788 |
+CXXFLAGS ?= -O3 |
| 789 |
+CXXFLAGS += $(USERCXXFLAGS) |
| 790 |
+LDFLAGS += $(USERLDFLAGS) |
| 791 |
|
| 792 |
#default target is Linux |
| 793 |
all: all_linux |
| 794 |
|
| 795 |
# target specific settings |
| 796 |
-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht |
| 797 |
-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 798 |
+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht |
| 799 |
+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 800 |
all_linux clean_linux: SYSTEM=Linux |
| 801 |
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc |
| 802 |
all_win32 clean_win32 static_win32: SUF=.exe |
| 803 |
--- examples/25.XmlHandling/Makefile |
| 804 |
+++ examples/25.XmlHandling/Makefile |
| 805 |
@@ -7,15 +7,15 @@ |
| 806 |
# List of source files, separated by spaces |
| 807 |
Sources := main.cpp |
| 808 |
# Path to Irrlicht directory, should contain include/ and lib/ |
| 809 |
-IrrlichtHome := ../.. |
| 810 |
+IrrlichtHome := /usr |
| 811 |
# Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems |
| 812 |
-BinPath = ../../bin/$(SYSTEM) |
| 813 |
+BinPath = ../../bin |
| 814 |
|
| 815 |
# general compiler settings (might need to be set when compiling the lib, too) |
| 816 |
# preprocessor flags, e.g. defines and include paths |
| 817 |
USERCPPFLAGS = |
| 818 |
# compiler flags such as optimization flags |
| 819 |
-USERCXXFLAGS = -O3 -ffast-math |
| 820 |
+USERCXXFLAGS = -ffast-math |
| 821 |
#USERCXXFLAGS = -g -Wall |
| 822 |
# linker flags such as additional libraries and link paths |
| 823 |
USERLDFLAGS = |
| 824 |
@@ -24,16 +24,17 @@ |
| 825 |
#no changes necessary below this line |
| 826 |
#### |
| 827 |
|
| 828 |
-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS) |
| 829 |
-CXXFLAGS = $(USERCXXFLAGS) |
| 830 |
-LDFLAGS = $(USERLDFLAGS) |
| 831 |
+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS) |
| 832 |
+CXXFLAGS ?= -O3 |
| 833 |
+CXXFLAGS += $(USERCXXFLAGS) |
| 834 |
+LDFLAGS += $(USERLDFLAGS) |
| 835 |
|
| 836 |
#default target is Linux |
| 837 |
all: all_linux |
| 838 |
|
| 839 |
# target specific settings |
| 840 |
-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht |
| 841 |
-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 842 |
+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht |
| 843 |
+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 844 |
all_linux clean_linux: SYSTEM=Linux |
| 845 |
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc |
| 846 |
all_win32 clean_win32 static_win32: SUF=.exe |
| 847 |
--- examples/26.OcclusionQuery/Makefile |
| 848 |
+++ examples/26.OcclusionQuery/Makefile |
| 849 |
@@ -5,8 +5,9 @@ |
| 850 |
Sources = main.cpp |
| 851 |
|
| 852 |
# general compiler settings |
| 853 |
-CPPFLAGS = -I../../include -I/usr/X11R6/include |
| 854 |
-CXXFLAGS = -O3 -ffast-math |
| 855 |
+CPPFLAGS += -I/usr/include/irrlicht |
| 856 |
+CXXFLAGS ?= -O3 |
| 857 |
+CXXFLAGS += -ffast-math |
| 858 |
#CXXFLAGS = -g -Wall |
| 859 |
|
| 860 |
#default target is Linux |
| 861 |
@@ -17,14 +18,14 @@ |
| 862 |
endif |
| 863 |
|
| 864 |
# target specific settings |
| 865 |
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
| 866 |
+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg |
| 867 |
all_linux clean_linux: SYSTEM=Linux |
| 868 |
all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
| 869 |
all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL |
| 870 |
all_win32 clean_win32: SYSTEM=Win32-gcc |
| 871 |
all_win32 clean_win32: SUF=.exe |
| 872 |
# name of the binary - only valid for targets which set SYSTEM |
| 873 |
-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
| 874 |
+DESTPATH = ../../bin/$(Target)$(SUF) |
| 875 |
|
| 876 |
all_linux all_win32: |
| 877 |
$(warning Building...) |
Archives