Attachment 103014 Details for Bug 142874 – irrlicht-1.6.1.patch

[patch] irrlicht-1.6.1.patch

irrlicht-1.6.1.patch (text/plain), 17.66 KB, created by Dmitry Marakasov on 2010-01-15 23:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2010-01-15 23:10:00 UTC

Size: 17.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/x11-toolkits/irrlicht/Makefile,v
>retrieving revision 1.21
>diff -u -u -r1.21 Makefile
>--- Makefile	5 Sep 2009 00:55:52 -0000	1.21
>+++ Makefile	15 Jan 2010 20:55:05 -0000
>@@ -6,9 +6,9 @@
> #
> 
> PORTNAME=	irrlicht
>-PORTVERSION=	1.5.1
>+PORTVERSION=	1.6.1
> CATEGORIES=	x11-toolkits graphics
>-MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/1.6/${PORTVERSION}
> 
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	High performance realtime 3D engine
>@@ -26,7 +26,7 @@
> SUB_FILES=	pkg-message
> BUILD_WRKSRC=	${WRKSRC}/source/Irrlicht
> 
>-SHARED_LIB_VER=	1.5.1
>+SHARED_LIB_VER=	${PORTVERSION}
> EXAMPLEDIRS=	01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \
> 		06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \
> 		11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \
>@@ -63,7 +63,8 @@
> 
> post-patch:
> .if !defined(HAVE_JOYSTICK)
>-	@${REINPLACE_CMD} -e 81d ${WRKSRC}/include/IrrCompileConfig.h
>+	@${REINPLACE_CMD} -e '/define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \
>+		${WRKSRC}/include/IrrCompileConfig.h
> .endif
> 
> do-install:
>@@ -72,7 +73,7 @@
> 		${INSTALL_DATA} *.h ${PREFIX}/include/${PORTNAME}
> 	${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a ${PREFIX}/lib
> 	${INSTALL_PROGRAM} ${WRKSRC}/lib/FreeBSD/libIrrlicht.so.${SHARED_LIB_VER} \
>-		${PREFIX}/lib && ${LN} -s ${PREFIX}/lib/libIrrlicht.so.${SHARED_LIB_VER} \
>+		${PREFIX}/lib && ${LN} -s libIrrlicht.so.${SHARED_LIB_VER} \
> 			${PREFIX}/lib/libIrrlicht.so
> 
> .if !defined(WITHOUT_EXAMPLES)
>Index: distinfo
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/x11-toolkits/irrlicht/distinfo,v
>retrieving revision 1.10
>diff -u -u -r1.10 distinfo
>--- distinfo	5 Sep 2009 00:55:52 -0000	1.10
>+++ distinfo	15 Jan 2010 19:41:29 -0000
>@@ -1,3 +1,3 @@
>-MD5 (irrlicht-1.5.1.zip) = 0174959bf5dc97fd645d2b714ba9bf6a
>-SHA256 (irrlicht-1.5.1.zip) = b5518bdb3fa8098ca92795a4bb03d19596b81103797fbaca199fc546d3c07070
>-SIZE (irrlicht-1.5.1.zip) = 22514017
>+MD5 (irrlicht-1.6.1.zip) = 6c7fa12053c475e3305cad4e720cb711
>+SHA256 (irrlicht-1.6.1.zip) = be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9
>+SIZE (irrlicht-1.6.1.zip) = 22299175
>Index: pkg-plist
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/x11-toolkits/irrlicht/pkg-plist,v
>retrieving revision 1.8
>diff -u -u -r1.8 pkg-plist
>--- pkg-plist	5 Sep 2009 00:55:52 -0000	1.8
>+++ pkg-plist	15 Jan 2010 20:22:56 -0000
>@@ -4,6 +4,7 @@
> include/irrlicht/CVertexBuffer.h
> include/irrlicht/ECullingTypes.h
> include/irrlicht/EDebugSceneTypes.h
>+include/irrlicht/EDeviceTypes.h
> include/irrlicht/EDriverFeatures.h
> include/irrlicht/EDriverTypes.h
> include/irrlicht/EGUIAlignment.h
>@@ -30,14 +31,15 @@
> include/irrlicht/IDummyTransformationSceneNode.h
> include/irrlicht/IDynamicMeshBuffer.h
> include/irrlicht/IEventReceiver.h
>+include/irrlicht/IFileArchive.h
> include/irrlicht/IFileList.h
> include/irrlicht/IFileSystem.h
> include/irrlicht/IGPUProgrammingServices.h
> include/irrlicht/IGUIButton.h
>+include/irrlicht/IGUICheckBox.h
> include/irrlicht/IGUIColorSelectDialog.h
> include/irrlicht/IGUIComboBox.h
> include/irrlicht/IGUIContextMenu.h
>-include/irrlicht/IGUICheckBox.h
> include/irrlicht/IGUIEditBox.h
> include/irrlicht/IGUIElement.h
> include/irrlicht/IGUIElementFactory.h
>@@ -46,6 +48,7 @@
> include/irrlicht/IGUIFont.h
> include/irrlicht/IGUIFontBitmap.h
> include/irrlicht/IGUIImage.h
>+include/irrlicht/IGUIImageList.h
> include/irrlicht/IGUIInOutFader.h
> include/irrlicht/IGUIListBox.h
> include/irrlicht/IGUIMeshViewer.h
>@@ -57,11 +60,14 @@
> include/irrlicht/IGUITabControl.h
> include/irrlicht/IGUITable.h
> include/irrlicht/IGUIToolbar.h
>+include/irrlicht/IGUITreeView.h
> include/irrlicht/IGUIWindow.h
>+include/irrlicht/IGeometryCreator.h
> include/irrlicht/IImage.h
> include/irrlicht/IImageLoader.h
> include/irrlicht/IImageWriter.h
> include/irrlicht/IIndexBuffer.h
>+include/irrlicht/ILightManager.h
> include/irrlicht/ILightSceneNode.h
> include/irrlicht/ILogger.h
> include/irrlicht/IMaterialRenderer.h
>@@ -136,9 +142,9 @@
> include/irrlicht/SParticle.h
> include/irrlicht/SSharedMeshBuffer.h
> include/irrlicht/SSkinMeshBuffer.h
>-include/irrlicht/SceneParameters.h
> include/irrlicht/SVertexIndex.h
> include/irrlicht/SViewFrustum.h
>+include/irrlicht/SceneParameters.h
> include/irrlicht/aabbox3d.h
> include/irrlicht/coreutil.h
> include/irrlicht/dimension2d.h
>@@ -156,6 +162,7 @@
> include/irrlicht/line2d.h
> include/irrlicht/line3d.h
> include/irrlicht/matrix4.h
>+include/irrlicht/path.h
> include/irrlicht/plane3d.h
> include/irrlicht/position2d.h
> include/irrlicht/quaternion.h
>@@ -221,7 +228,9 @@
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/017shot.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/018shot.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/019shot.jpg
>-%%EXAMPLES%%%%EXAMPLESDIR%%/media/2ddemo.bmp
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/020shot.jpg
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/021shot.jpg
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/2ddemo.png
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/Faerie5.BMP
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/IrrlichtTheme.ogg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/Particle.tga
>@@ -242,9 +251,9 @@
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf-Read-Me.txt
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.x
>-%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.bmp
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.x
>-%%EXAMPLES%%%%EXAMPLESDIR%%/media/earthbump.bmp
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/earthbump.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/enano.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/example.irr
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/faerie.md2
>@@ -254,7 +263,10 @@
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/fontcourier.bmp
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/fonthaettenschweiler.bmp
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/fontlucida.png
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/gun.jpg
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/gun.md2
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/help.png
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/iconlist.png
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/impact.wav
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irr.ico
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlicht.dat
>@@ -267,6 +279,7 @@
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo.BMP
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo2.png
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo3.png
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoaligned.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha.tga
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha2.tga
>@@ -295,13 +308,15 @@
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/portal5.bmp
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/portal6.bmp
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/portal7.bmp
>-%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall.bmp
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall_height.bmp
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/room.3ds
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/rsptnback.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/skydome.jpg
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/skydome2.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke.bmp
>-%%EXAMPLES%%%%EXAMPLESDIR%%/media/sphere.3ds
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke2.jpg
>+%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke3.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/spheremap.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/stones.jpg
> %%EXAMPLES%%%%EXAMPLESDIR%%/media/sydney.bmp
>Index: files/patch-include_IrrCompileConfig.h
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h,v
>retrieving revision 1.3
>diff -u -u -r1.3 patch-include_IrrCompileConfig.h
>--- files/patch-include_IrrCompileConfig.h	20 Aug 2007 07:02:28 -0000	1.3
>+++ files/patch-include_IrrCompileConfig.h	15 Jan 2010 19:56:42 -0000
>@@ -1,6 +1,6 @@
>---- include/IrrCompileConfig.h	Sun Aug 19 19:56:33 2007
>-+++ include/IrrCompileConfig.h	Sun Aug 19 19:57:30 2007
>-@@ -113,7 +113,7 @@
>+--- include/IrrCompileConfig.h.orig	2010-01-10 08:44:22.000000000 +0300
>++++ include/IrrCompileConfig.h	2010-01-15 22:48:52.000000000 +0300
>+@@ -175,7 +175,7 @@
>  //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
>  /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
>  	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
>@@ -9,7 +9,7 @@
>  
>  
>  //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
>-@@ -124,7 +124,7 @@
>+@@ -186,7 +186,7 @@
>  //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
>  /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
>  	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
>@@ -18,7 +18,7 @@
>  
>  
>  //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
>-@@ -135,7 +135,7 @@
>+@@ -197,7 +197,7 @@
>  //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
>  /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
>  	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
>Index: files/patch-source-Irrlicht_COSOperator.cpp
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp,v
>retrieving revision 1.4
>diff -u -u -r1.4 patch-source-Irrlicht_COSOperator.cpp
>--- files/patch-source-Irrlicht_COSOperator.cpp	10 Dec 2008 19:41:09 -0000	1.4
>+++ files/patch-source-Irrlicht_COSOperator.cpp	15 Jan 2010 19:56:42 -0000
>@@ -1,8 +1,8 @@
>----  source/Irrlicht/COSOperator.cpp	2008-12-06 13:48:20.000000000 -0500
>-+++  source/Irrlicht/COSOperator.cpp	2008-12-06 13:49:26.000000000 -0500
>-@@ -13,11 +13,9 @@
>- #ifdef _IRR_USE_OSX_DEVICE_
>- #include "OSXClipboard.h"
>+--- source/Irrlicht/COSOperator.cpp.orig	2009-09-19 15:58:12.000000000 +0400
>++++ source/Irrlicht/COSOperator.cpp	2010-01-15 22:50:26.000000000 +0300
>+@@ -15,11 +15,9 @@
>+ #ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
>+ #include "MacOSX/OSXClipboard.h"
>  #endif
> -#ifdef _IRR_OSX_PLATFORM_
>  #include <sys/types.h>
>@@ -10,9 +10,9 @@
>  #endif
> -#endif
>  
>- namespace irr
>- {
>-@@ -157,7 +155,7 @@
>+ #if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
>+ #include "CIrrDeviceLinux.h"
>+@@ -184,7 +182,7 @@
>  	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
>  	return true;
>  
>Index: files/patch-source-Irrlicht_Makefile
>===================================================================
>RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile,v
>retrieving revision 1.6
>diff -u -u -r1.6 patch-source-Irrlicht_Makefile
>--- files/patch-source-Irrlicht_Makefile	20 Jan 2009 08:16:02 -0000	1.6
>+++ files/patch-source-Irrlicht_Makefile	15 Jan 2010 22:33:07 -0000
>@@ -1,17 +1,18 @@
>---- source/Irrlicht/Makefile	2008-12-14 07:15:56.000000000 -0800
>-+++ source/Irrlicht/Makefile	2008-12-28 12:04:16.000000000 -0800
>-@@ -1,6 +1,6 @@
>- VERSION = 1.5
>- # Irrlicht Engine 1.5
>+--- source/Irrlicht/Makefile.orig	2010-01-16 01:32:18.000000000 +0300
>++++ source/Irrlicht/Makefile	2010-01-16 01:33:07.000000000 +0300
>+@@ -3,7 +3,7 @@
>+ VERSION_RELEASE = 1
>+ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
>+ # Irrlicht Engine 1.6.0-SVN
> -# Makefile for Linux
> +# Makefile for FreeBSD
>  #
>  # To use, just run:
>  #
>-@@ -36,29 +36,26 @@
>- IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o irrXML.o CAttributes.o
>- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.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
>+@@ -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
>+ 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
> -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
>@@ -26,10 +27,9 @@
>  #Compiler flags
> -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
> -CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
>--CXXFLAGS = -Wall -pipe
> +CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include
> +CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
>-+CXXFLAGS += -Wall -pipe
>+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
>  ifndef NDEBUG
>  CXXFLAGS += -g -D_DEBUG
>  else
>@@ -42,9 +42,9 @@
> -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
>  
>- sharedlib sharedlib_osx: CXXFLAGS += -fpic
>- sharedlib sharedlib_osx: CFLAGS += -fpic
>-@@ -68,16 +65,16 @@
>+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC
>+ sharedlib sharedlib_osx: CFLAGS += -fPIC
>+@@ -71,15 +68,15 @@
>  LIBSELECT=64
>  endif
>  
>@@ -53,20 +53,19 @@
> +#FreeBSD specific options
> +staticlib sharedlib install: SYSTEM = FreeBSD
>  STATIC_LIB = libIrrlicht.a
>- IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
>  LIB_PATH = ../../lib/$(SYSTEM)
> -INSTALL_DIR = /usr/local/lib
> +INSTALL_DIR = $(PREFIX)/lib
>- sharedlib: SHARED_LIB = libIrrlicht.so
>- staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
>+ sharedlib install: SHARED_LIB = libIrrlicht.so
>+ staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
> -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
> -staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
>-+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm
>++sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg
> +staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include
>  
>  #OSX specific options
>  staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
>-@@ -94,20 +91,22 @@
>+@@ -97,20 +94,22 @@
>  staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
>  
>  ####################
>@@ -78,8 +77,8 @@
> -# 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).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
>-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
>+-	$(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)
>  	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
>  
>@@ -94,7 +93,7 @@
>  	cp $^ $(LIB_PATH)
>  
>  # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
>-@@ -152,9 +151,9 @@
>+@@ -153,9 +152,9 @@
>  
>  help:
>  	@echo "Available targets for Irrlicht"
>@@ -103,7 +102,7 @@
> -	@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 /usr/local/lib"
>++	@echo " install: Copy shared library to $(LOCALBASE)/lib"
>  	@echo ""
>  	@echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
>  	@echo " staticlib_win32: Build static library Irrlicht.a for Windows"

Actions: View | Diff

Attachments on bug 142874: 103014