diff options
Diffstat (limited to 'x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile')
| -rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 73 |
1 files changed, 38 insertions, 35 deletions
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index 9d5dc1848a0a..1522a900474d 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -1,34 +1,41 @@ ---- source/Irrlicht/Makefile.orig 2010-01-16 01:32:18.000000000 +0300 -+++ source/Irrlicht/Makefile 2010-01-16 01:33:07.000000000 +0300 +--- source/Irrlicht/Makefile 2010-12-13 14:40:13.000000000 -0500 ++++ source/Irrlicht/Makefile 2010-12-13 14:46:13.000000000 -0500 @@ -3,7 +3,7 @@ - VERSION_RELEASE = 1 + VERSION_RELEASE = 2 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) - # Irrlicht Engine 1.6.0-SVN + # Irrlicht Engine 1.7.2 -# Makefile for Linux -+# Makefile for FreeBSD ++# Makefile for FreeBSD/Linux # # To use, just run: # -@@ -39,29 +39,26 @@ - IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o - IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o +@@ -39,33 +39,32 @@ + IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o + IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o 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 -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 --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/jcphuff.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/jdphuff.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/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o +-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 -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 ++#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 ++#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 ++#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 + 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 +-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o ++#BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o + # Next variable is for additional scene nodes etc. of customized Irrlicht versions EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ -- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ) -+ $(IRRGUIOBJ) $(EXTRAOBJ) +- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ +- $(BZIP2OBJ) $(EXTRAOBJ) ++ $(IRRGUIOBJ) $(LIBAESGM) $(BZIP2OBJ) $(EXTRAOBJ) ############### #Compiler flags -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng --CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 +CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include -+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 + CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing ifndef NDEBUG CXXFLAGS += -g -D_DEBUG @@ -39,18 +46,18 @@ ifdef PROFILE CXXFLAGS += -pg endif --CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES -+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES +-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES ++#CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES sharedlib sharedlib_osx: CXXFLAGS += -fPIC sharedlib sharedlib_osx: CFLAGS += -fPIC -@@ -71,15 +68,15 @@ +@@ -75,15 +74,15 @@ LIBSELECT=64 endif -#Linux specific options -staticlib sharedlib install: SYSTEM = Linux -+#FreeBSD specific options ++# FreeBSD/Linux specific options +staticlib sharedlib install: SYSTEM = FreeBSD STATIC_LIB = libIrrlicht.a LIB_PATH = ../../lib/$(SYSTEM) @@ -65,44 +72,40 @@ #OSX specific options staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX -@@ -97,20 +94,22 @@ +@@ -103,12 +102,12 @@ staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ #################### --# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/Linux +-# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux -all linux: staticlib -+# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/FreeBSD ++# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/FreeBSD +all linux: staticlib sharedlib --# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux -+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/FreeBSD +-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux ++# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/FreeBSD sharedlib: $(LINKOBJ) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) -+ mkdir -p $(LIB_PATH) + mkdir -p $(LIB_PATH) cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) - # Builds Irrlicht as static lib (libIrrlicht.a) +@@ -116,7 +115,7 @@ $(STATIC_LIB): $(LINKOBJ) $(AR) rs $@ $^ --# Copies static lib into /lib/Linux -+# Copies static lib into /lib/FreeBSD +-# Copies static lib into lib/Linux ++# Copies static lib into lib/FreeBSD staticlib staticlib_osx: $(STATIC_LIB) -+ mkdir -p $(LIB_PATH) + mkdir -p $(LIB_PATH) cp $^ $(LIB_PATH) - - # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc -@@ -153,9 +152,9 @@ +@@ -165,8 +164,8 @@ help: @echo "Available targets for Irrlicht" - @echo " sharedlib: Build shared library Irrlicht.so for Linux" - @echo " staticlib: Build static library Irrlicht.a for Linux" -- @echo " install: Copy shared library to /usr/lib" -+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD" -+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD" -+ @echo " install: Copy shared library to $(LOCALBASE)/lib" ++ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD/Linux" ++ @echo " staticlib: Build static library Irrlicht.a for FreeBSD/Linux" + @echo " install: Copy shared library to /usr/local/lib" @echo "" @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows" - @echo " staticlib_win32: Build static library Irrlicht.a for Windows" |