Attachment #103014 for bug #142874

View | Details | Raw Unified | Return to bug 142874
Collapse All | Expand All




#

PORTNAME=	irrlicht
PORTVERSION=	1.6.1
CATEGORIES=	x11-toolkits graphics
MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/1.6/${PORTVERSION}

MAINTAINER=	acm@FreeBSD.org
COMMENT=	High performance realtime 3D engine

SUB_FILES=	pkg-message
BUILD_WRKSRC=	${WRKSRC}/source/Irrlicht

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 \


post-patch:
.if !defined(HAVE_JOYSTICK)
	@${REINPLACE_CMD} -e '/define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \
		${WRKSRC}/include/IrrCompileConfig.h
.endif

do-install:

		${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 libIrrlicht.so.${SHARED_LIB_VER} \
			${PREFIX}/lib/libIrrlicht.so

.if !defined(WITHOUT_EXAMPLES)

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (irrlicht-1.5.1.zip) = 0174959bf5dc97fd645d2b714ba9bf6a	1	MD5 (irrlicht-1.6.1.zip) = 6c7fa12053c475e3305cad4e720cb711
2	SHA256 (irrlicht-1.5.1.zip) = b5518bdb3fa8098ca92795a4bb03d19596b81103797fbaca199fc546d3c07070	2	SHA256 (irrlicht-1.6.1.zip) = be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9
3	SIZE (irrlicht-1.5.1.zip) = 22514017	3	SIZE (irrlicht-1.6.1.zip) = 22299175




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

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

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

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

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

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

%%EXAMPLES%%%%EXAMPLESDIR%%/media/017shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/018shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/019shot.jpg
%%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

%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf-Read-Me.txt
%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.x
%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.x
%%EXAMPLES%%%%EXAMPLESDIR%%/media/earthbump.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/enano.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/example.irr
%%EXAMPLES%%%%EXAMPLESDIR%%/media/faerie.md2

%%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

%%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

%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal5.bmp
%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal6.bmp
%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal7.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/smoke2.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke3.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/spheremap.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/stones.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/sydney.bmp




--- 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. */

 
 
 //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -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. */

 
 
 //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -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. */




--- 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>

 #endif
-#endif
 
 #if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
 #include "CIrrDeviceLinux.h"
@@ -184,7 +182,7 @@
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return true;
 




--- 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:
 #
@@ -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

 #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 -fno-exceptions -fno-rtti -fstrict-aliasing
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG
 else

-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
@@ -71,15 +68,15 @@
 LIBSELECT=64
 endif
 

+#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 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 -lpng -ljpeg
+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include
 
 #OSX specific options
 staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
@@ -97,20 +94,22 @@
 staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
 
 ####################

-# 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)
 	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
 

 	cp $^ $(LIB_PATH)
 
 # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
@@ -153,9 +152,9 @@
 
 help:
 	@echo "Available targets for Irrlicht"

-	@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 ""
 	@echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
 	@echo " staticlib_win32: Build static library Irrlicht.a for Windows"

Return to bug 142874

Lines 6-14 Link Here

(-)Makefile (-5 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= irrlicht	8	PORTNAME= irrlicht
9	PORTVERSION= 1.5.1	9	PORTVERSION= 1.6.1
10	CATEGORIES= x11-toolkits graphics	10	CATEGORIES= x11-toolkits graphics
11	MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.6/${PORTVERSION}
12		12
13	MAINTAINER= acm@FreeBSD.org	13	MAINTAINER= acm@FreeBSD.org
14	COMMENT= High performance realtime 3D engine	14	COMMENT= High performance realtime 3D engine
Lines 26-32 Link Here
26	SUB_FILES= pkg-message	26	SUB_FILES= pkg-message
27	BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht	27	BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht
28		28
29	SHARED_LIB_VER= 1.5.1	29	SHARED_LIB_VER= ${PORTVERSION}
30	EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \	30	EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \
31	06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \	31	06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \
32	11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \	32	11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \
Lines 63-69 Link Here
63		63
64	post-patch:	64	post-patch:
65	.if !defined(HAVE_JOYSTICK)	65	.if !defined(HAVE_JOYSTICK)
66	@${REINPLACE_CMD} -e 81d ${WRKSRC}/include/IrrCompileConfig.h	66	@${REINPLACE_CMD} -e '/define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \
		67	${WRKSRC}/include/IrrCompileConfig.h
67	.endif	68	.endif
68		69
69	do-install:	70	do-install:
Lines 72-78 Link Here
72	${INSTALL_DATA} *.h ${PREFIX}/include/${PORTNAME}	73	${INSTALL_DATA} *.h ${PREFIX}/include/${PORTNAME}
73	${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a ${PREFIX}/lib	74	${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD/libIrrlicht.a ${PREFIX}/lib
74	${INSTALL_PROGRAM} ${WRKSRC}/lib/FreeBSD/libIrrlicht.so.${SHARED_LIB_VER} \	75	${INSTALL_PROGRAM} ${WRKSRC}/lib/FreeBSD/libIrrlicht.so.${SHARED_LIB_VER} \
75	${PREFIX}/lib && ${LN} -s ${PREFIX}/lib/libIrrlicht.so.${SHARED_LIB_VER} \	76	${PREFIX}/lib && ${LN} -s libIrrlicht.so.${SHARED_LIB_VER} \
76	${PREFIX}/lib/libIrrlicht.so	77	${PREFIX}/lib/libIrrlicht.so
77		78
78	.if !defined(WITHOUT_EXAMPLES)	79	.if !defined(WITHOUT_EXAMPLES)

Lines 4-9 Link Here

(-)pkg-plist (-7 / +22 lines)
4	include/irrlicht/CVertexBuffer.h	4	include/irrlicht/CVertexBuffer.h
5	include/irrlicht/ECullingTypes.h	5	include/irrlicht/ECullingTypes.h
6	include/irrlicht/EDebugSceneTypes.h	6	include/irrlicht/EDebugSceneTypes.h
		7	include/irrlicht/EDeviceTypes.h
7	include/irrlicht/EDriverFeatures.h	8	include/irrlicht/EDriverFeatures.h
8	include/irrlicht/EDriverTypes.h	9	include/irrlicht/EDriverTypes.h
9	include/irrlicht/EGUIAlignment.h	10	include/irrlicht/EGUIAlignment.h
Lines 30-43 Link Here
30	include/irrlicht/IDummyTransformationSceneNode.h	31	include/irrlicht/IDummyTransformationSceneNode.h
31	include/irrlicht/IDynamicMeshBuffer.h	32	include/irrlicht/IDynamicMeshBuffer.h
32	include/irrlicht/IEventReceiver.h	33	include/irrlicht/IEventReceiver.h
		34	include/irrlicht/IFileArchive.h
33	include/irrlicht/IFileList.h	35	include/irrlicht/IFileList.h
34	include/irrlicht/IFileSystem.h	36	include/irrlicht/IFileSystem.h
35	include/irrlicht/IGPUProgrammingServices.h	37	include/irrlicht/IGPUProgrammingServices.h
36	include/irrlicht/IGUIButton.h	38	include/irrlicht/IGUIButton.h
		39	include/irrlicht/IGUICheckBox.h
37	include/irrlicht/IGUIColorSelectDialog.h	40	include/irrlicht/IGUIColorSelectDialog.h
38	include/irrlicht/IGUIComboBox.h	41	include/irrlicht/IGUIComboBox.h
39	include/irrlicht/IGUIContextMenu.h	42	include/irrlicht/IGUIContextMenu.h
40	include/irrlicht/IGUICheckBox.h
41	include/irrlicht/IGUIEditBox.h	43	include/irrlicht/IGUIEditBox.h
42	include/irrlicht/IGUIElement.h	44	include/irrlicht/IGUIElement.h
43	include/irrlicht/IGUIElementFactory.h	45	include/irrlicht/IGUIElementFactory.h
Lines 46-51 Link Here
46	include/irrlicht/IGUIFont.h	48	include/irrlicht/IGUIFont.h
47	include/irrlicht/IGUIFontBitmap.h	49	include/irrlicht/IGUIFontBitmap.h
48	include/irrlicht/IGUIImage.h	50	include/irrlicht/IGUIImage.h
		51	include/irrlicht/IGUIImageList.h
49	include/irrlicht/IGUIInOutFader.h	52	include/irrlicht/IGUIInOutFader.h
50	include/irrlicht/IGUIListBox.h	53	include/irrlicht/IGUIListBox.h
51	include/irrlicht/IGUIMeshViewer.h	54	include/irrlicht/IGUIMeshViewer.h
Lines 57-67 Link Here
57	include/irrlicht/IGUITabControl.h	60	include/irrlicht/IGUITabControl.h
58	include/irrlicht/IGUITable.h	61	include/irrlicht/IGUITable.h
59	include/irrlicht/IGUIToolbar.h	62	include/irrlicht/IGUIToolbar.h
		63	include/irrlicht/IGUITreeView.h
60	include/irrlicht/IGUIWindow.h	64	include/irrlicht/IGUIWindow.h
		65	include/irrlicht/IGeometryCreator.h
61	include/irrlicht/IImage.h	66	include/irrlicht/IImage.h
62	include/irrlicht/IImageLoader.h	67	include/irrlicht/IImageLoader.h
63	include/irrlicht/IImageWriter.h	68	include/irrlicht/IImageWriter.h
64	include/irrlicht/IIndexBuffer.h	69	include/irrlicht/IIndexBuffer.h
		70	include/irrlicht/ILightManager.h
65	include/irrlicht/ILightSceneNode.h	71	include/irrlicht/ILightSceneNode.h
66	include/irrlicht/ILogger.h	72	include/irrlicht/ILogger.h
67	include/irrlicht/IMaterialRenderer.h	73	include/irrlicht/IMaterialRenderer.h
Lines 136-144 Link Here
136	include/irrlicht/SParticle.h	142	include/irrlicht/SParticle.h
137	include/irrlicht/SSharedMeshBuffer.h	143	include/irrlicht/SSharedMeshBuffer.h
138	include/irrlicht/SSkinMeshBuffer.h	144	include/irrlicht/SSkinMeshBuffer.h
139	include/irrlicht/SceneParameters.h
140	include/irrlicht/SVertexIndex.h	145	include/irrlicht/SVertexIndex.h
141	include/irrlicht/SViewFrustum.h	146	include/irrlicht/SViewFrustum.h
		147	include/irrlicht/SceneParameters.h
142	include/irrlicht/aabbox3d.h	148	include/irrlicht/aabbox3d.h
143	include/irrlicht/coreutil.h	149	include/irrlicht/coreutil.h
144	include/irrlicht/dimension2d.h	150	include/irrlicht/dimension2d.h
Lines 156-161 Link Here
156	include/irrlicht/line2d.h	162	include/irrlicht/line2d.h
157	include/irrlicht/line3d.h	163	include/irrlicht/line3d.h
158	include/irrlicht/matrix4.h	164	include/irrlicht/matrix4.h
		165	include/irrlicht/path.h
159	include/irrlicht/plane3d.h	166	include/irrlicht/plane3d.h
160	include/irrlicht/position2d.h	167	include/irrlicht/position2d.h
161	include/irrlicht/quaternion.h	168	include/irrlicht/quaternion.h
Lines 221-227 Link Here
221	%%EXAMPLES%%%%EXAMPLESDIR%%/media/017shot.jpg	228	%%EXAMPLES%%%%EXAMPLESDIR%%/media/017shot.jpg
222	%%EXAMPLES%%%%EXAMPLESDIR%%/media/018shot.jpg	229	%%EXAMPLES%%%%EXAMPLESDIR%%/media/018shot.jpg
223	%%EXAMPLES%%%%EXAMPLESDIR%%/media/019shot.jpg	230	%%EXAMPLES%%%%EXAMPLESDIR%%/media/019shot.jpg
224	%%EXAMPLES%%%%EXAMPLESDIR%%/media/2ddemo.bmp	231	%%EXAMPLES%%%%EXAMPLESDIR%%/media/020shot.jpg
		232	%%EXAMPLES%%%%EXAMPLESDIR%%/media/021shot.jpg
		233	%%EXAMPLES%%%%EXAMPLESDIR%%/media/2ddemo.png
225	%%EXAMPLES%%%%EXAMPLESDIR%%/media/Faerie5.BMP	234	%%EXAMPLES%%%%EXAMPLESDIR%%/media/Faerie5.BMP
226	%%EXAMPLES%%%%EXAMPLESDIR%%/media/IrrlichtTheme.ogg	235	%%EXAMPLES%%%%EXAMPLESDIR%%/media/IrrlichtTheme.ogg
227	%%EXAMPLES%%%%EXAMPLESDIR%%/media/Particle.tga	236	%%EXAMPLES%%%%EXAMPLESDIR%%/media/Particle.tga
Lines 242-250 Link Here
242	%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf-Read-Me.txt	251	%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf-Read-Me.txt
243	%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.jpg	252	%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.jpg
244	%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.x	253	%%EXAMPLES%%%%EXAMPLESDIR%%/media/dwarf.x
245	%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.bmp	254	%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.jpg
246	%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.x	255	%%EXAMPLES%%%%EXAMPLESDIR%%/media/earth.x
247	%%EXAMPLES%%%%EXAMPLESDIR%%/media/earthbump.bmp	256	%%EXAMPLES%%%%EXAMPLESDIR%%/media/earthbump.jpg
248	%%EXAMPLES%%%%EXAMPLESDIR%%/media/enano.jpg	257	%%EXAMPLES%%%%EXAMPLESDIR%%/media/enano.jpg
249	%%EXAMPLES%%%%EXAMPLESDIR%%/media/example.irr	258	%%EXAMPLES%%%%EXAMPLESDIR%%/media/example.irr
250	%%EXAMPLES%%%%EXAMPLESDIR%%/media/faerie.md2	259	%%EXAMPLES%%%%EXAMPLESDIR%%/media/faerie.md2
Lines 254-260 Link Here
254	%%EXAMPLES%%%%EXAMPLESDIR%%/media/fontcourier.bmp	263	%%EXAMPLES%%%%EXAMPLESDIR%%/media/fontcourier.bmp
255	%%EXAMPLES%%%%EXAMPLESDIR%%/media/fonthaettenschweiler.bmp	264	%%EXAMPLES%%%%EXAMPLESDIR%%/media/fonthaettenschweiler.bmp
256	%%EXAMPLES%%%%EXAMPLESDIR%%/media/fontlucida.png	265	%%EXAMPLES%%%%EXAMPLESDIR%%/media/fontlucida.png
		266	%%EXAMPLES%%%%EXAMPLESDIR%%/media/gun.jpg
		267	%%EXAMPLES%%%%EXAMPLESDIR%%/media/gun.md2
257	%%EXAMPLES%%%%EXAMPLESDIR%%/media/help.png	268	%%EXAMPLES%%%%EXAMPLESDIR%%/media/help.png
		269	%%EXAMPLES%%%%EXAMPLESDIR%%/media/iconlist.png
258	%%EXAMPLES%%%%EXAMPLESDIR%%/media/impact.wav	270	%%EXAMPLES%%%%EXAMPLESDIR%%/media/impact.wav
259	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irr.ico	271	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irr.ico
260	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlicht.dat	272	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlicht.dat
Lines 267-272 Link Here
267	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo.BMP	279	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo.BMP
268	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo.jpg	280	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo.jpg
269	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo2.png	281	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo2.png
		282	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogo3.png
270	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoaligned.jpg	283	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoaligned.jpg
271	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha.tga	284	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha.tga
272	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha2.tga	285	%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha2.tga
Lines 295-307 Link Here
295	%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal5.bmp	308	%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal5.bmp
296	%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal6.bmp	309	%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal6.bmp
297	%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal7.bmp	310	%%EXAMPLES%%%%EXAMPLESDIR%%/media/portal7.bmp
298	%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall.bmp	311	%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall.jpg
299	%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall_height.bmp	312	%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall_height.bmp
300	%%EXAMPLES%%%%EXAMPLESDIR%%/media/room.3ds	313	%%EXAMPLES%%%%EXAMPLESDIR%%/media/room.3ds
301	%%EXAMPLES%%%%EXAMPLESDIR%%/media/rsptnback.jpg	314	%%EXAMPLES%%%%EXAMPLESDIR%%/media/rsptnback.jpg
302	%%EXAMPLES%%%%EXAMPLESDIR%%/media/skydome.jpg	315	%%EXAMPLES%%%%EXAMPLESDIR%%/media/skydome.jpg
		316	%%EXAMPLES%%%%EXAMPLESDIR%%/media/skydome2.jpg
303	%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke.bmp	317	%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke.bmp
304	%%EXAMPLES%%%%EXAMPLESDIR%%/media/sphere.3ds	318	%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke2.jpg
		319	%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke3.jpg
305	%%EXAMPLES%%%%EXAMPLESDIR%%/media/spheremap.jpg	320	%%EXAMPLES%%%%EXAMPLESDIR%%/media/spheremap.jpg
306	%%EXAMPLES%%%%EXAMPLESDIR%%/media/stones.jpg	321	%%EXAMPLES%%%%EXAMPLESDIR%%/media/stones.jpg
307	%%EXAMPLES%%%%EXAMPLESDIR%%/media/sydney.bmp	322	%%EXAMPLES%%%%EXAMPLESDIR%%/media/sydney.bmp

Lines 1-6 Link Here

(-)files/patch-include_IrrCompileConfig.h (-5 / +5 lines)
1	--- include/IrrCompileConfig.h Sun Aug 19 19:56:33 2007	1	--- include/IrrCompileConfig.h.orig 2010-01-10 08:44:22.000000000 +0300
2	+++ include/IrrCompileConfig.h Sun Aug 19 19:57:30 2007	2	+++ include/IrrCompileConfig.h 2010-01-15 22:48:52.000000000 +0300
3	@@ -113,7 +113,7 @@	3	@@ -175,7 +175,7 @@
4	//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.	4	//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
5	/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.	5	/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
6	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */	6	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
Lines 9-15 Link Here
9		9
10		10
11	//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.	11	//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
12	@@ -124,7 +124,7 @@	12	@@ -186,7 +186,7 @@
13	//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.	13	//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
14	/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.	14	/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
15	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */	15	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
Lines 18-24 Link Here
18		18
19		19
20	//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.	20	//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
21	@@ -135,7 +135,7 @@	21	@@ -197,7 +197,7 @@
22	//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.	22	//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
23	/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.	23	/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
24	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */	24	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */

Lines 1-8 Link Here

(-)files/patch-source-Irrlicht_COSOperator.cpp (-8 / +8 lines)
1	--- source/Irrlicht/COSOperator.cpp 2008-12-06 13:48:20.000000000 -0500	1	--- source/Irrlicht/COSOperator.cpp.orig 2009-09-19 15:58:12.000000000 +0400
2	+++ source/Irrlicht/COSOperator.cpp 2008-12-06 13:49:26.000000000 -0500	2	+++ source/Irrlicht/COSOperator.cpp 2010-01-15 22:50:26.000000000 +0300
3	@@ -13,11 +13,9 @@	3	@@ -15,11 +15,9 @@
4	#ifdef _IRR_USE_OSX_DEVICE_	4	#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
5	#include "OSXClipboard.h"	5	#include "MacOSX/OSXClipboard.h"
6	#endif	6	#endif
7	-#ifdef _IRR_OSX_PLATFORM_	7	-#ifdef _IRR_OSX_PLATFORM_
8	#include <sys/types.h>	8	#include <sys/types.h>
Lines 10-18 Link Here
10	#endif	10	#endif
11	-#endif	11	-#endif
12		12
13	namespace irr	13	#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
14	{	14	#include "CIrrDeviceLinux.h"
15	@@ -157,7 +155,7 @@	15	@@ -184,7 +182,7 @@
16	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;	16	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
17	return true;	17	return true;
18		18

Lines 1-17 Link Here

(-)files/patch-source-Irrlicht_Makefile (-23 / +22 lines)
1	--- source/Irrlicht/Makefile 2008-12-14 07:15:56.000000000 -0800	1	--- source/Irrlicht/Makefile.orig 2010-01-16 01:32:18.000000000 +0300
2	+++ source/Irrlicht/Makefile 2008-12-28 12:04:16.000000000 -0800	2	+++ source/Irrlicht/Makefile 2010-01-16 01:33:07.000000000 +0300
3	@@ -1,6 +1,6 @@	3	@@ -3,7 +3,7 @@
4	VERSION = 1.5	4	VERSION_RELEASE = 1
5	# Irrlicht Engine 1.5	5	VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
		6	# Irrlicht Engine 1.6.0-SVN
6	-# Makefile for Linux	7	-# Makefile for Linux
7	+# Makefile for FreeBSD	8	+# Makefile for FreeBSD
8	#	9	#
9	# To use, just run:	10	# To use, just run:
10	#	11	#
11	@@ -36,29 +36,26 @@	12	@@ -39,29 +39,26 @@
12	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	13	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
13	IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o	14	IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
14	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	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
15	-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	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
16	-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	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/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
17	-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	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
Lines 26-35 Link Here
26	#Compiler flags	27	#Compiler flags
27	-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng	28	-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
28	-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1	29	-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
29	-CXXFLAGS = -Wall -pipe
30	+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include	30	+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include
31	+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1	31	+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
32	+CXXFLAGS += -Wall -pipe	32	CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
33	ifndef NDEBUG	33	ifndef NDEBUG
34	CXXFLAGS += -g -D_DEBUG	34	CXXFLAGS += -g -D_DEBUG
35	else	35	else
Lines 42-50 Link Here
42	-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES	42	-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
43	+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES	43	+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
44		44
45	sharedlib sharedlib_osx: CXXFLAGS += -fpic	45	sharedlib sharedlib_osx: CXXFLAGS += -fPIC
46	sharedlib sharedlib_osx: CFLAGS += -fpic	46	sharedlib sharedlib_osx: CFLAGS += -fPIC
47	@@ -68,16 +65,16 @@	47	@@ -71,15 +68,15 @@
48	LIBSELECT=64	48	LIBSELECT=64
49	endif	49	endif
50		50
Lines 53-72 Link Here
53	+#FreeBSD specific options	53	+#FreeBSD specific options
54	+staticlib sharedlib install: SYSTEM = FreeBSD	54	+staticlib sharedlib install: SYSTEM = FreeBSD
55	STATIC_LIB = libIrrlicht.a	55	STATIC_LIB = libIrrlicht.a
56	IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
57	LIB_PATH = ../../lib/$(SYSTEM)	56	LIB_PATH = ../../lib/$(SYSTEM)
58	-INSTALL_DIR = /usr/local/lib	57	-INSTALL_DIR = /usr/local/lib
59	+INSTALL_DIR = $(PREFIX)/lib	58	+INSTALL_DIR = $(PREFIX)/lib
60	sharedlib: SHARED_LIB = libIrrlicht.so	59	sharedlib install: SHARED_LIB = libIrrlicht.so
61	staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias	60	staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
62	-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm	61	-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
63	-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include	62	-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
64	+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm	63	+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg
65	+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include	64	+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include
66		65
67	#OSX specific options	66	#OSX specific options
68	staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX	67	staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
69	@@ -94,20 +91,22 @@	68	@@ -97,20 +94,22 @@
70	staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_	69	staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
71		70
72	####################	71	####################
Lines 78-85 Link Here
78	-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux	77	-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux
79	+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/FreeBSD	78	+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/FreeBSD
80	sharedlib: $(LINKOBJ)	79	sharedlib: $(LINKOBJ)
81	- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)	80	- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
82	+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)	81	+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
83	+ mkdir -p $(LIB_PATH)	82	+ mkdir -p $(LIB_PATH)
84	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)	83	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
85		84
Lines 94-100 Link Here
94	cp $^ $(LIB_PATH)	93	cp $^ $(LIB_PATH)
95		94
96	# Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc	95	# Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
97	@@ -152,9 +151,9 @@	96	@@ -153,9 +152,9 @@
98		97
99	help:	98	help:
100	@echo "Available targets for Irrlicht"	99	@echo "Available targets for Irrlicht"
Lines 103-109 Link Here
103	- @echo " install: Copy shared library to /usr/lib"	102	- @echo " install: Copy shared library to /usr/lib"
104	+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD"	103	+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD"
105	+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD"	104	+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD"
106	+ @echo " install: Copy shared library to /usr/local/lib"	105	+ @echo " install: Copy shared library to $(LOCALBASE)/lib"
107	@echo ""	106	@echo ""
108	@echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"	107	@echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
109	@echo " staticlib_win32: Build static library Irrlicht.a for Windows"	108	@echo " staticlib_win32: Build static library Irrlicht.a for Windows"