- Update to 0.12.0 [1]

- Explicitely link against libz, libpng, libjpeg
- Remove @'s in do-install: target, so one sees what's going on

Reminded by:	Edwin's version nagger [1]
This commit is contained in:
Simon Barner 2005-10-20 00:29:37 +00:00
parent ea418da248
commit f3827aab25
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=145901
7 changed files with 86 additions and 90 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= irrlicht
PORTVERSION= 0.10.0
PORTVERSION= 0.12.0
CATEGORIES= x11-toolkits graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -17,13 +17,14 @@ COMMENT= High performance realtime 3D engine
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
USE_GL= yes
USE_ZIP= yes
USE_REINPLACE= yes
WRKBASE= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRC= ${WRKBASE}/source/Irrlicht
INSTALLS_SHLIB= yes
SHARED_LIB_VER= 2
PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER}
EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \
06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \
@ -34,42 +35,37 @@ EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserIn
# g++ 2.95.4 does not support the language features used by Irrlicht
USE_GCC= 3.3+
.if !defined(NOPORTDOCS)
PORTDOCS= examples media
POST_INSTALL_SEQ+= doc-install
.endif
# The source is resides in a zip file inside the distribution archive
# The source resides in a zip file inside the distribution archive
post-extract:
@cd ${WRKBASE}/source && \
${UNZIP_CMD} -a source.zip > /dev/null
@${RM} -rf ${WRKSRC}/zlib ${WRKSRC}/jpeglib ${WRKSRC}/libpng
do-install:
@${MKDIR} ${PREFIX}/lib
@${INSTALL_PROGRAM} ${WRKSRC}/libIrrlicht.a ${PREFIX}/lib
@${INSTALL_PROGRAM} ${WRKSRC}/libIrrlicht.so.1 ${PREFIX}/lib
@cd ${PREFIX}/lib && ${RM} -f libIrrlicht.so && ${LN} libIrrlicht.so.1 libIrrlicht.so
@${MKDIR} ${PREFIX}/include/irrlicht
@${FIND} ${WRKSRC}/include -name "*.h" -exec ${INSTALL_DATA} {} \
${MKDIR} ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/libIrrlicht.so.${PORTVERSION} ${PREFIX}/lib/libIrrlicht.so.${SHARED_LIB_VER}
cd ${PREFIX}/lib && ${RM} -f libIrrlicht.so && ${LN} libIrrlicht.so.${SHARED_LIB_VER} libIrrlicht.so
${MKDIR} ${PREFIX}/include/irrlicht
${FIND} ${WRKSRC}/include -name "*.h" -exec ${INSTALL_DATA} {} \
${PREFIX}/include/irrlicht \;
post-install: ${POST_INSTALL_SEQ}
doc-install:
.if !defined(NOPORTDOCS)
# These are example applications.
.for dir in ${EXAMPLEDIRS}
@${MKDIR} ${DOCSDIR}/examples/${dir}
@${REINPLACE_CMD} -e 's|../../include|${PREFIX}/include/${PORTNAME}|' \
-e 's|../../lib/Linux|${LOCALBASE}/lib|' \
${MKDIR} ${DOCSDIR}/examples/${dir}
${REINPLACE_CMD} -e 's|../../include|${PREFIX}/include/${PORTNAME}|' \
-e 's|../../lib/Linux|${PREFIX}/lib|' \
${WRKBASE}/examples/${dir}/Makefile
@${INSTALL_DATA} ${WRKBASE}/examples/${dir}/Makefile \
${INSTALL_DATA} ${WRKBASE}/examples/${dir}/Makefile \
${DOCSDIR}/examples/${dir}
@${FIND} ${WRKBASE}/examples/${dir} \( -name "*.cpp" -or -name "*.h" \) \
${FIND} ${WRKBASE}/examples/${dir} \( -name "*.cpp" -or -name "*.h" \) \
-exec ${INSTALL_DATA} {} ${DOCSDIR}/examples/${dir} \;
.endfor
@${MKDIR} ${DOCSDIR}/media
@${FIND} ${WRKBASE}/media -type f \
${MKDIR} ${DOCSDIR}/media
${FIND} ${WRKBASE}/media -type f \
-exec ${INSTALL_DATA} {} ${DOCSDIR}/media \;
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (irrlicht-0.10.0.zip) = 027244998de45944aa80f81f3f7fde55
SIZE (irrlicht-0.10.0.zip) = 13540616
MD5 (irrlicht-0.12.0.zip) = b6f046fee28630cf08aa391ee69c94c5
SIZE (irrlicht-0.12.0.zip) = 14060742

View file

@ -1,13 +1,18 @@
--- CImageLoaderJPG.h.orig Sun Sep 19 00:48:11 2004
+++ CImageLoaderJPG.h Sun Sep 19 00:53:05 2004
@@ -12,8 +12,8 @@
--- CImageLoaderJPG.h.orig Wed Oct 19 17:24:14 2005
+++ CImageLoaderJPG.h Wed Oct 19 17:26:32 2005
@@ -12,12 +12,13 @@
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_LIBJPEG_
extern "C" {
-#include "jpeglib/jconfig.h"
-#include "jpeglib/jpeglib.h"
+#include "jconfig.h"
+#include "jpeglib.h"
- #include "jpeglib/jconfig.h"
#ifndef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #include <jconfig.h>
#include <jpeglib.h> // use system lib
#else // _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #include "jpeglib/jconfig.h"
#include "jpeglib/jpeglib.h" // use irrlicht jpeglib
-#endif // _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif // _IRR_USE_NON_SYSTEM_JPEG_LIB_
}
#endif
#endif // _IRR_COMPILE_WITH_LIBJPEG_

View file

@ -1,11 +0,0 @@
--- CZipReader.cpp.orig Sun Sep 19 00:54:31 2004
+++ CZipReader.cpp Sun Sep 19 00:54:53 2004
@@ -11,7 +11,7 @@
#ifdef _WIN32
#include "zlib\zlib.h"
#else
-#include "zlib/zlib.h"
+#include <zlib.h>
#endif // win32
#endif // compile with zlib

View file

@ -1,51 +1,27 @@
--- Makefile.orig Wed May 25 18:43:26 2005
+++ Makefile Sun Jun 26 21:07:02 2005
@@ -1,29 +1,38 @@
# Irrlicht Engine 0.10.0
# Makefile for Linux, created from Bloodshed Win32 Makefile by N.Gebhardt.
--- Makefile.orig Wed Aug 24 20:31:56 2005
+++ Makefile Thu Oct 20 02:26:40 2005
@@ -18,17 +18,17 @@
# probably not tested.
#
-CPP = g++
-LINKOBJ = 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 CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CColorConverter.o CFPSCounter.o CImage.o CImageLoaderBmp.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CNullDriver.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CVideoModeList.o C3DSMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMS3D.o CAnimatedMeshSceneNode.o CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CColladaFileLoader.o CCSMLoader.o CDefaultMeshFormatLoader.o CDMFLoader.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CLMTSMeshFileLoader.o CMeshManipulator.o CMeshSceneNode.o CMetaTriangleSelector.o CMY3DMeshFileLoader.o COCTLoader.o COctTreeSceneNode.o COctTreeTriangleSelector.o CParticleBoxEmitter.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticlePointEmitter.o CParticleSystemSceneNode.o CQ3LevelMesh.o CSceneCollisionManager.o CSceneManager.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CStaticMeshOBJ.o CTerrainSceneNode.o CTerrainTriangleSelector.o CTestSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CXAnimationPlayer.o CXFileReader.o CXMeshFileLoader.o CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o irrXML.o 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 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 jpeglib/rdbmp.o jpeglib/rdcolmap.o jpeglib/rdgif.o jpeglib/rdppm.o jpeglib/rdrle.o jpeglib/rdswitch.o jpeglib/rdtarga.o jpeglib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.o 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 CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o CStringParameters.o Irrlicht.o os.o $(RES)
-LIBS = -L"/usr/X11R6/lib" -L"jpeglib" -L"zlib" --no-export-all-symbols --add-stdcall-alias -lGL -lXxf86vm
-LINKOBJ = 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 CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CColorConverter.o CFPSCounter.o CImage.o CImageLoaderBmp.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CNullDriver.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CVideoModeList.o C3DSMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMS3D.o CAnimatedMeshSceneNode.o CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CColladaFileLoader.o CCSMLoader.o CDefaultMeshFormatLoader.o CDMFLoader.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CLMTSMeshFileLoader.o CMeshManipulator.o CMeshSceneNode.o CMetaTriangleSelector.o CMY3DMeshFileLoader.o COCTLoader.o COctTreeSceneNode.o COctTreeTriangleSelector.o CParticleBoxEmitter.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticlePointEmitter.o CParticleSystemSceneNode.o CQ3LevelMesh.o CSceneCollisionManager.o CSceneManager.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CStaticMeshOBJ.o CTerrainSceneNode.o CTerrainTriangleSelector.o CTestSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CXAnimationPlayer.o CXFileReader.o CXMeshFileLoader.o CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o irrXML.o 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 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 jpeglib/rdbmp.o jpeglib/rdcolmap.o jpeglib/rdgif.o jpeglib/rdppm.o jpeglib/rdrle.o jpeglib/rdswitch.o jpeglib/rdtarga.o jpeglib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.o 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 CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o CStringParameters.o Irrlicht.o os.o CMeshCache.o COpenGLSLMaterialRenderer.o $(RES)
-LIBS = -L"/usr/X11R6/lib" -L"jpeglib" -L"zlib" --no-export-all-symbols --add-stdcall-alias -lGL -lGLU -lXxf86vm
-CXXINCS = -I"include/" -I"zlib/"
+.SUFFIXES: .So
+
+CPP = $(CXX)
+LINKOBJ = 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 CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CColorConverter.o CFPSCounter.o CImage.o CImageLoaderBmp.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CNullDriver.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CVideoModeList.o C3DSMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMS3D.o CAnimatedMeshSceneNode.o CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CColladaFileLoader.o CCSMLoader.o CDefaultMeshFormatLoader.o CDMFLoader.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CLMTSMeshFileLoader.o CMeshManipulator.o CMeshSceneNode.o CMetaTriangleSelector.o CMY3DMeshFileLoader.o COCTLoader.o COctTreeSceneNode.o COctTreeTriangleSelector.o CParticleBoxEmitter.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticlePointEmitter.o CParticleSystemSceneNode.o CQ3LevelMesh.o CSceneCollisionManager.o CSceneManager.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CStaticMeshOBJ.o CTerrainSceneNode.o CTerrainTriangleSelector.o CTestSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CXAnimationPlayer.o CXFileReader.o CXMeshFileLoader.o CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o irrXML.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o CStringParameters.o Irrlicht.o os.o $(RES)
+LINKOBJ_SHARED= ${LINKOBJ:.o=.So}
+LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib --no-export-all-symbols --add-stdcall-alias -lGL -lXxf86vm -lz -ljpeg -lpng
+CXXINCS = -Iinclude
BIN = libIrrlicht.a
+CPP = ${CXX}
+LINKOBJ = 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 CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CColorConverter.o CFPSCounter.o CImage.o CImageLoaderBmp.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CNullDriver.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CVideoModeList.o C3DSMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMS3D.o CAnimatedMeshSceneNode.o CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CColladaFileLoader.o CCSMLoader.o CDefaultMeshFormatLoader.o CDMFLoader.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CLMTSMeshFileLoader.o CMeshManipulator.o CMeshSceneNode.o CMetaTriangleSelector.o CMY3DMeshFileLoader.o COCTLoader.o COctTreeSceneNode.o COctTreeTriangleSelector.o CParticleBoxEmitter.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticlePointEmitter.o CParticleSystemSceneNode.o CQ3LevelMesh.o CSceneCollisionManager.o CSceneManager.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CStaticMeshOBJ.o CTerrainSceneNode.o CTerrainTriangleSelector.o CTestSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CXAnimationPlayer.o CXFileReader.o CXMeshFileLoader.o CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o irrXML.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o CStringParameters.o Irrlicht.o os.o CMeshCache.o COpenGLSLMaterialRenderer.o $(RES)
+LIBS = -L${X11BASE}/lib -L/${LOCALBASE}/lib --no-export-all-symbols --add-stdcall-alias -lGL -lGLU -lXxf86vm -lz -lpng -ljpeg
+CXXINCS = -I"include/" -I${X11BASE}/include -I${LOCALBASE}/include
STATIC_LIB = libIrrlicht.a
SHARED_LIB = libIrrlicht.so
-CXXFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
+BIN_SHARED = libIrrlicht.so.1
+CXXFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 ${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include
+
+.cpp.So:
+ ${CXX} ${CXXFLAGS} -fPIC -c ${.IMPSRC} -o ${.TARGET}
-INSTALL_DIR = /usr/local/lib
+CXXFLAGS+= $(CXXINCS) -DIRRLICHT_EXPORTS=1
+INSTALL_DIR = ${PREFIX}/lib
-all: $(LINKOBJ) $(BIN)
- cp libIrrlicht.a ../../lib/Linux/
+all: $(LINKOBJ) $(BIN) $(BIN_SHARED)
# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/Linux
-all: $(LINKOBJ) staticlib
+all: $(LINKOBJ) sharedlib
# Cleans all temporary files and compilation results.
clean:
rm -f $(LINKOBJ) $(BIN)
$(BIN): $(LINKOBJ)
- ar r $(BIN) $(LINKOBJ)
+ ar r $(BIN) `lorder $(LINKOBJ) | tsort -q`
ranlib $(BIN)
+$(BIN_SHARED): $(LINKOBJ_SHARED)
+ $(CXX) -shared -Wl,-x -o ${.TARGET} -Wl,-soname,$(BIN_SHARED) \
+ `lorder $(LINKOBJ_SHARED) | tsort -q` $(LIBS)
CGUIButton.o: CGUIButton.cpp
$(CPP) -c CGUIButton.cpp -o CGUIButton.o $(CXXFLAGS)
-CGUICheckbox.o: CGUICheckBox.cpp
- $(CPP) -c CGUICheckBox.cpp -o CGUICheckbox.o $(CXXFLAGS)
+CGUICheckBox.o: CGUICheckBox.cpp
+ $(CPP) -c CGUICheckBox.cpp -o CGUICheckBox.o $(CXXFLAGS)
CGUIComboBox.o: CGUIComboBox.cpp
$(CPP) -c CGUIComboBox.cpp -o CGUIComboBox.o $(CXXFLAGS)

View file

@ -0,0 +1,29 @@
--- include/IrrCompileConfig.h.orig Wed Oct 19 17:20:37 2005
+++ include/IrrCompileConfig.h Wed Oct 19 17:21:01 2005
@@ -65,7 +65,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_USE_NON_SYSTEM_ZLIB_
+// #define _IRR_USE_NON_SYSTEM_ZLIB_
//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -76,7 +76,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_USE_NON_SYSTEM_JPEG_LIB_
+// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -87,7 +87,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. */
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+// #define _IRR_USE_NON_SYSTEM_LIB_PNG_
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9

View file

@ -1,7 +1,7 @@
lib/libIrrlicht.a
lib/libIrrlicht.so
lib/libIrrlicht.so.1
lib/libIrrlicht.so.%%SHARED_LIB_VER%%
include/irrlicht/EDriverTypes.h
include/irrlicht/EGUIElementTypes.h
include/irrlicht/IAnimatedMesh.h
include/irrlicht/IAnimatedMeshMD2.h
include/irrlicht/IAnimatedMeshMS3D.h
@ -41,6 +41,7 @@ include/irrlicht/ILogger.h
include/irrlicht/IMaterialRenderer.h
include/irrlicht/IMesh.h
include/irrlicht/IMeshBuffer.h
include/irrlicht/IMeshCache.h
include/irrlicht/IMeshLoader.h
include/irrlicht/IMeshManipulator.h
include/irrlicht/IMetaTriangleSelector.h
@ -69,6 +70,7 @@ include/irrlicht/IVideoModeList.h
include/irrlicht/IWriteFile.h
include/irrlicht/IXMLReader.h
include/irrlicht/IXMLWriter.h
include/irrlicht/IrrCompileConfig.h
include/irrlicht/IrrlichtDevice.h
include/irrlicht/Keycodes.h
include/irrlicht/S3DVertex.h
@ -79,7 +81,6 @@ include/irrlicht/SIrrCreationParameters.h
include/irrlicht/SKeyMap.h
include/irrlicht/SLight.h
include/irrlicht/SMaterial.h
include/irrlicht/SMaterialHelper.h
include/irrlicht/SMesh.h
include/irrlicht/SMeshBuffer.h
include/irrlicht/SMeshBufferLightMap.h