|
Line 0
Link Here
|
|
|
1 |
--- source/Irrlicht/Makefile.orig 2011-01-18 12:59:32.115168764 +0100 |
| 2 |
+++ source/Irrlicht/Makefile 2011-01-18 13:00:20.726282913 +0100 |
| 3 |
@@ -3,7 +3,7 @@ VERSION_MINOR = 7 |
| 4 |
VERSION_RELEASE = 2 |
| 5 |
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) |
| 6 |
# Irrlicht Engine 1.7.2 |
| 7 |
-# Makefile for Linux |
| 8 |
+# Makefile for FreeBSD/Linux |
| 9 |
# |
| 10 |
# To use, just run: |
| 11 |
# |
| 12 |
@@ -39,33 +39,32 @@ IRRSWRENDEROBJ = CSoftwareDriver.o CSoft |
| 13 |
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 |
| 14 |
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o |
| 15 |
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 |
| 16 |
-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 |
| 17 |
-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 |
| 18 |
-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 |
| 19 |
+#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 |
| 20 |
+#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 |
| 21 |
+#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 |
| 22 |
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 |
| 23 |
-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o |
| 24 |
+#BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o |
| 25 |
|
| 26 |
# Next variable is for additional scene nodes etc. of customized Irrlicht versions |
| 27 |
EXTRAOBJ = |
| 28 |
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ |
| 29 |
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ |
| 30 |
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ |
| 31 |
- $(BZIP2OBJ) $(EXTRAOBJ) |
| 32 |
+ $(IRRGUIOBJ) $(LIBAESGM) $(BZIP2OBJ) $(EXTRAOBJ) |
| 33 |
|
| 34 |
############### |
| 35 |
#Compiler flags |
| 36 |
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng |
| 37 |
+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include |
| 38 |
CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 |
| 39 |
CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing |
| 40 |
ifndef NDEBUG |
| 41 |
CXXFLAGS += -g -D_DEBUG |
| 42 |
else |
| 43 |
-CXXFLAGS += -fexpensive-optimizations -O3 |
| 44 |
+CXXFLAGS += -fexpensive-optimizations |
| 45 |
endif |
| 46 |
ifdef PROFILE |
| 47 |
CXXFLAGS += -pg |
| 48 |
endif |
| 49 |
-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES |
| 50 |
+#CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES |
| 51 |
|
| 52 |
sharedlib sharedlib_osx: CXXFLAGS += -fPIC |
| 53 |
sharedlib sharedlib_osx: CFLAGS += -fPIC |
| 54 |
@@ -75,15 +74,15 @@ ifeq ($(HOSTTYPE), x86_64) |
| 55 |
LIBSELECT=64 |
| 56 |
endif |
| 57 |
|
| 58 |
-#Linux specific options |
| 59 |
-staticlib sharedlib install: SYSTEM = Linux |
| 60 |
+# FreeBSD/Linux specific options |
| 61 |
+staticlib sharedlib install: SYSTEM = FreeBSD |
| 62 |
STATIC_LIB = libIrrlicht.a |
| 63 |
LIB_PATH = ../../lib/$(SYSTEM) |
| 64 |
-INSTALL_DIR = /usr/local/lib |
| 65 |
+INSTALL_DIR = $(PREFIX)/lib |
| 66 |
sharedlib install: SHARED_LIB = libIrrlicht.so |
| 67 |
staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias |
| 68 |
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm |
| 69 |
-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include |
| 70 |
+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg |
| 71 |
+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include |
| 72 |
|
| 73 |
#OSX specific options |
| 74 |
staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX |
| 75 |
@@ -103,20 +102,20 @@ sharedlib_win32 staticlib_win32: CPPFLAG |
| 76 |
staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ |
| 77 |
|
| 78 |
#################### |
| 79 |
-# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux |
| 80 |
-all linux: staticlib |
| 81 |
+# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/FreeBSD |
| 82 |
+all linux: staticlib sharedlib |
| 83 |
|
| 84 |
-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux |
| 85 |
+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/FreeBSD |
| 86 |
sharedlib: $(LINKOBJ) |
| 87 |
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) |
| 88 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(SHLIB_VER) -o $(SHARED_LIB).$(SHLIB_VER) $^ $(LDFLAGS) |
| 89 |
mkdir -p $(LIB_PATH) |
| 90 |
- cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) |
| 91 |
+ cp $(SHARED_LIB).$(SHLIB_VER) $(LIB_PATH) |
| 92 |
|
| 93 |
# Builds Irrlicht as static lib (libIrrlicht.a) |
| 94 |
$(STATIC_LIB): $(LINKOBJ) |
| 95 |
$(AR) rs $@ $^ |
| 96 |
|
| 97 |
-# Copies static lib into lib/Linux |
| 98 |
+# Copies static lib into lib/FreeBSD |
| 99 |
staticlib staticlib_osx: $(STATIC_LIB) |
| 100 |
mkdir -p $(LIB_PATH) |
| 101 |
cp $^ $(LIB_PATH) |
| 102 |
@@ -165,8 +164,8 @@ endif |
| 103 |
|
| 104 |
help: |
| 105 |
@echo "Available targets for Irrlicht" |
| 106 |
- @echo " sharedlib: Build shared library Irrlicht.so for Linux" |
| 107 |
- @echo " staticlib: Build static library Irrlicht.a for Linux" |
| 108 |
+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD/Linux" |
| 109 |
+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD/Linux" |
| 110 |
@echo " install: Copy shared library to /usr/local/lib" |
| 111 |
@echo "" |
| 112 |
@echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows" |