Skip to content

I
Irrlicht New
Commit 0e7ef4a0 authored by nanahira's avatar nanahira
Browse files
Options

updates from upstream

parent 42db4456
Pipeline #34200 passed with stages
        in 2 minutes and 32 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 66 additions and 240 deletions
        defines.lua 0 → 100644
        View file @ 0e7ef4a0
        defines {
        "_IRR_STATIC_LIB_",
        "NO_IRR_USE_NON_SYSTEM_BZLIB_",
        "NO_IRR_COMPILE_WITH_BZIP2_",
        "NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
        "NO_IRR_COMPILE_WITH_DIRECT3D_8_",
        "NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
        "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
        "NO_IRR_COMPILE_WITH_SOFTWARE_",
        "NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
        "NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
        "NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
        "NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
        "NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
        "NO_IRR_COMPILE_WITH_MD2_LOADER_",
        "NO_IRR_COMPILE_WITH_MD3_LOADER_",
        "NO_IRR_COMPILE_WITH_3DS_LOADER_",
        "NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
        "NO_IRR_COMPILE_WITH_CSM_LOADER_",
        "NO_IRR_COMPILE_WITH_BSP_LOADER_",
        "NO_IRR_COMPILE_WITH_DMF_LOADER_",
        "NO_IRR_COMPILE_WITH_LMTS_LOADER_",
        "NO_IRR_COMPILE_WITH_MY3D_LOADER_",
        "NO_IRR_COMPILE_WITH_OBJ_LOADER_",
        "NO_IRR_COMPILE_WITH_OCT_LOADER_",
        "NO_IRR_COMPILE_WITH_LWO_LOADER_",
        "NO_IRR_COMPILE_WITH_STL_LOADER_",
        "NO_IRR_COMPILE_WITH_PLY_LOADER_",
        "NO_IRR_COMPILE_WITH_SMF_LOADER_",
        "NO_IRR_COMPILE_WITH_IRR_WRITER_",
        "NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
        "NO_IRR_COMPILE_WITH_STL_WRITER_",
        "NO_IRR_COMPILE_WITH_OBJ_WRITER_",
        "NO_IRR_COMPILE_WITH_PLY_WRITER_",
        "NO_IRR_COMPILE_WITH_PCX_LOADER_",
        "NO_IRR_COMPILE_WITH_PPM_LOADER_",
        "NO_IRR_COMPILE_WITH_PSD_LOADER_",
        "NO_IRR_COMPILE_WITH_TGA_LOADER_",
        "NO_IRR_COMPILE_WITH_WAL_LOADER_",
        "NO_IRR_COMPILE_WITH_LMP_LOADER_",
        "NO_IRR_COMPILE_WITH_RGB_LOADER_",
        "NO_IRR_COMPILE_WITH_PCX_WRITER_",
        "NO_IRR_COMPILE_WITH_PPM_WRITER_",
        "NO_IRR_COMPILE_WITH_PSD_WRITER_",
        "NO_IRR_COMPILE_WITH_TGA_WRITER_",
        "NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
        "NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
        "NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
        }
        premake5.lua
        View file @ 0e7ef4a0
        ......@@ -3,189 +3,31 @@ project "irrlicht"
        includedirs { "include", "source/Irrlicht", "source/Irrlicht/jpeglib", "source/Irrlicht/libpng", "source/Irrlicht/zlib" }
        defines { "_IRR_STATIC_LIB_" }
        dofile("defines.lua")
        exceptionhandling "Off"
        rtti "Off"
        files { "source/Irrlicht/CCgMaterialRenderer.cpp",
        "source/Irrlicht/CD3D9CgMaterialRenderer.cpp",
        "source/Irrlicht/CDefaultSceneNodeAnimatorFactory.cpp",
        "source/Irrlicht/CDefaultSceneNodeFactory.cpp",
        "source/Irrlicht/CGeometryCreator.cpp",
        "source/Irrlicht/CMeshCache.cpp",
        "source/Irrlicht/CMeshManipulator.cpp",
        "source/Irrlicht/COpenGLCgMaterialRenderer.cpp",
        "source/Irrlicht/CSceneManager.cpp",
        "source/Irrlicht/C3DSMeshFileLoader.cpp",
        "source/Irrlicht/CSMFMeshFileLoader.cpp",
        "source/Irrlicht/CAnimatedMeshHalfLife.cpp",
        "source/Irrlicht/CAnimatedMeshMD2.cpp",
        "source/Irrlicht/CAnimatedMeshMD3.cpp",
        "source/Irrlicht/CB3DMeshFileLoader.cpp",
        "source/Irrlicht/CBSPMeshFileLoader.cpp",
        "source/Irrlicht/CColladaFileLoader.cpp",
        "source/Irrlicht/CCSMLoader.cpp",
        "source/Irrlicht/CDMFLoader.cpp",
        "source/Irrlicht/CIrrMeshFileLoader.cpp",
        "source/Irrlicht/CLMTSMeshFileLoader.cpp",
        "source/Irrlicht/CLWOMeshFileLoader.cpp",
        "source/Irrlicht/CMD2MeshFileLoader.cpp",
        "source/Irrlicht/CMD3MeshFileLoader.cpp",
        "source/Irrlicht/CMS3DMeshFileLoader.cpp",
        "source/Irrlicht/CMY3DMeshFileLoader.cpp",
        "source/Irrlicht/COBJMeshFileLoader.cpp",
        "source/Irrlicht/COCTLoader.cpp",
        "source/Irrlicht/COgreMeshFileLoader.cpp",
        "source/Irrlicht/CPLYMeshFileLoader.cpp",
        "source/Irrlicht/CQ3LevelMesh.cpp",
        "source/Irrlicht/CSkinnedMesh.cpp",
        "source/Irrlicht/CSTLMeshFileLoader.cpp",
        "source/Irrlicht/CXMeshFileLoader.cpp",
        "source/Irrlicht/CAnimatedMeshSceneNode.cpp",
        "source/Irrlicht/CBillboardSceneNode.cpp",
        "source/Irrlicht/CBoneSceneNode.cpp",
        "source/Irrlicht/CCameraSceneNode.cpp",
        "source/Irrlicht/CCubeSceneNode.cpp",
        "source/Irrlicht/CDummyTransformationSceneNode.cpp",
        "source/Irrlicht/CEmptySceneNode.cpp",
        "source/Irrlicht/CLightSceneNode.cpp",
        "source/Irrlicht/CMeshSceneNode.cpp",
        "source/Irrlicht/COctreeSceneNode.cpp",
        "source/Irrlicht/CQuake3ShaderSceneNode.cpp",
        "source/Irrlicht/CShadowVolumeSceneNode.cpp",
        "source/Irrlicht/CSkyBoxSceneNode.cpp",
        "source/Irrlicht/CSkyDomeSceneNode.cpp",
        "source/Irrlicht/CSphereSceneNode.cpp",
        "source/Irrlicht/CTerrainSceneNode.cpp",
        "source/Irrlicht/CTextSceneNode.cpp",
        "source/Irrlicht/CVolumeLightSceneNode.cpp",
        "source/Irrlicht/CWaterSurfaceSceneNode.cpp",
        "source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp",
        "source/Irrlicht/CParticleAttractionAffector.cpp",
        "source/Irrlicht/CParticleBoxEmitter.cpp",
        "source/Irrlicht/CParticleCylinderEmitter.cpp",
        "source/Irrlicht/CParticleFadeOutAffector.cpp",
        "source/Irrlicht/CParticleGravityAffector.cpp",
        "source/Irrlicht/CParticleMeshEmitter.cpp",
        "source/Irrlicht/CParticlePointEmitter.cpp",
        "source/Irrlicht/CParticleRingEmitter.cpp",
        "source/Irrlicht/CParticleRotationAffector.cpp",
        "source/Irrlicht/CParticleScaleAffector.cpp",
        "source/Irrlicht/CParticleSphereEmitter.cpp",
        "source/Irrlicht/CParticleSystemSceneNode.cpp",
        "source/Irrlicht/CMetaTriangleSelector.cpp",
        "source/Irrlicht/COctreeTriangleSelector.cpp",
        "source/Irrlicht/CSceneCollisionManager.cpp",
        "source/Irrlicht/CTerrainTriangleSelector.cpp",
        "source/Irrlicht/CTriangleBBSelector.cpp",
        "source/Irrlicht/CTriangleSelector.cpp",
        "source/Irrlicht/CSceneLoaderIrr.cpp",
        "source/Irrlicht/CSceneNodeAnimatorCameraFPS.cpp",
        "source/Irrlicht/CSceneNodeAnimatorCameraMaya.cpp",
        "source/Irrlicht/CSceneNodeAnimatorCollisionResponse.cpp",
        "source/Irrlicht/CSceneNodeAnimatorDelete.cpp",
        "source/Irrlicht/CSceneNodeAnimatorFlyCircle.cpp",
        "source/Irrlicht/CSceneNodeAnimatorFlyStraight.cpp",
        "source/Irrlicht/CSceneNodeAnimatorFollowSpline.cpp",
        "source/Irrlicht/CSceneNodeAnimatorRotation.cpp",
        "source/Irrlicht/CSceneNodeAnimatorTexture.cpp",
        "source/Irrlicht/CColladaMeshWriter.cpp",
        "source/Irrlicht/CIrrMeshWriter.cpp",
        "source/Irrlicht/COBJMeshWriter.cpp",
        "source/Irrlicht/CPLYMeshWriter.cpp",
        "source/Irrlicht/CSTLMeshWriter.cpp",
        "source/Irrlicht/CVideoModeList.cpp",
        "source/Irrlicht/CSoftwareDriver.cpp",
        "source/Irrlicht/CSoftwareTexture.cpp",
        "source/Irrlicht/CTRFlat.cpp",
        "source/Irrlicht/CTRFlatWire.cpp",
        "source/Irrlicht/CTRGouraud.cpp",
        "source/Irrlicht/CTRGouraudWire.cpp",
        "source/Irrlicht/CTRTextureFlat.cpp",
        "source/Irrlicht/CTRTextureFlatWire.cpp",
        "source/Irrlicht/CTRTextureGouraud.cpp",
        "source/Irrlicht/CTRTextureGouraudAdd.cpp",
        "source/Irrlicht/CTRTextureGouraudNoZ.cpp",
        "source/Irrlicht/CTRTextureGouraudWire.cpp",
        "source/Irrlicht/CZBuffer.cpp",
        "source/Irrlicht/COpenGLDriver.cpp",
        "source/Irrlicht/COpenGLExtensionHandler.cpp",
        "source/Irrlicht/COpenGLNormalMapRenderer.cpp",
        "source/Irrlicht/COpenGLParallaxMapRenderer.cpp",
        "source/Irrlicht/COpenGLShaderMaterialRenderer.cpp",
        "source/Irrlicht/COpenGLSLMaterialRenderer.cpp",
        "source/Irrlicht/COpenGLTexture.cpp",
        "source/Irrlicht/CD3D8Driver.cpp",
        "source/Irrlicht/CD3D8NormalMapRenderer.cpp",
        "source/Irrlicht/CD3D8ParallaxMapRenderer.cpp",
        "source/Irrlicht/CD3D8ShaderMaterialRenderer.cpp",
        "source/Irrlicht/CD3D8Texture.cpp",
        "source/Irrlicht/CColorConverter.cpp",
        "source/Irrlicht/CFPSCounter.cpp",
        "source/Irrlicht/CImage.cpp",
        "source/Irrlicht/CNullDriver.cpp",
        "source/Irrlicht/CImageWriterBMP.cpp",
        "source/Irrlicht/CImageWriterJPG.cpp",
        "source/Irrlicht/CImageWriterPCX.cpp",
        "source/Irrlicht/CImageWriterPNG.cpp",
        "source/Irrlicht/CImageWriterPPM.cpp",
        "source/Irrlicht/CImageWriterPSD.cpp",
        "source/Irrlicht/CImageWriterTGA.cpp",
        "source/Irrlicht/CImageLoaderBMP.cpp",
        "source/Irrlicht/CImageLoaderDDS.cpp",
        "source/Irrlicht/CImageLoaderJPG.cpp",
        "source/Irrlicht/CImageLoaderPCX.cpp",
        "source/Irrlicht/CImageLoaderPNG.cpp",
        "source/Irrlicht/CImageLoaderPPM.cpp",
        "source/Irrlicht/CImageLoaderPSD.cpp",
        "source/Irrlicht/CImageLoaderRGB.cpp",
        "source/Irrlicht/CImageLoaderTGA.cpp",
        "source/Irrlicht/CImageLoaderWAL.cpp",
        "source/Irrlicht/CD3D9Driver.cpp",
        "source/Irrlicht/CD3D9HLSLMaterialRenderer.cpp",
        "source/Irrlicht/CD3D9NormalMapRenderer.cpp",
        "source/Irrlicht/CD3D9ParallaxMapRenderer.cpp",
        "source/Irrlicht/CD3D9ShaderMaterialRenderer.cpp",
        "source/Irrlicht/CD3D9Texture.cpp",
        "source/Irrlicht/CBurningShader_Raster_Reference.cpp",
        "source/Irrlicht/CDepthBuffer.cpp",
        "source/Irrlicht/CSoftwareDriver2.cpp",
        "source/Irrlicht/CSoftwareTexture2.cpp",
        "source/Irrlicht/CTRGouraud2.cpp",
        "source/Irrlicht/CTRGouraudAlpha2.cpp",
        "source/Irrlicht/CTRGouraudAlphaNoZ2.cpp",
        "source/Irrlicht/CTRNormalMap.cpp",
        "source/Irrlicht/CTRStencilShadow.cpp",
        "source/Irrlicht/CTRTextureBlend.cpp",
        "source/Irrlicht/CTRTextureDetailMap2.cpp",
        "source/Irrlicht/CTRTextureGouraud2.cpp",
        "source/Irrlicht/CTRTextureGouraudAdd2.cpp",
        "source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp",
        "source/Irrlicht/CTRTextureGouraudAlpha.cpp",
        "source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp",
        "source/Irrlicht/CTRTextureGouraudNoZ2.cpp",
        "source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp",
        "source/Irrlicht/CTRTextureLightMap2_Add.cpp",
        "source/Irrlicht/CTRTextureLightMap2_M1.cpp",
        "source/Irrlicht/CTRTextureLightMap2_M2.cpp",
        "source/Irrlicht/CTRTextureLightMap2_M4.cpp",
        "source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp",
        "source/Irrlicht/CTRTextureWire2.cpp",
        "source/Irrlicht/IBurningShader.cpp",
        "source/Irrlicht/CLogger.cpp",
        "source/Irrlicht/COSOperator.cpp",
        "source/Irrlicht/Irrlicht.cpp",
        "source/Irrlicht/os.cpp",
        "source/Irrlicht/lzma/LzmaDec.c",
        files { "include/*.h",
        "source/Irrlicht/*.cpp",
        "source/Irrlicht/lzma/*.h",
        "source/Irrlicht/lzma/*.c",
        "source/Irrlicht/zlib/zlib.h",
        "source/Irrlicht/zlib/adler32.c",
        "source/Irrlicht/zlib/compress.c",
        "source/Irrlicht/zlib/crc32.h",
        "source/Irrlicht/zlib/crc32.c",
        "source/Irrlicht/zlib/deflate.h",
        "source/Irrlicht/zlib/deflate.c",
        "source/Irrlicht/zlib/inffast.h",
        "source/Irrlicht/zlib/inffast.c",
        "source/Irrlicht/zlib/inflate.h",
        "source/Irrlicht/zlib/inflate.c",
        "source/Irrlicht/zlib/inftrees.h",
        "source/Irrlicht/zlib/inftrees.c",
        "source/Irrlicht/zlib/trees.h",
        "source/Irrlicht/zlib/trees.c",
        "source/Irrlicht/zlib/uncompr.c",
        "source/Irrlicht/zlib/zutil.h",
        "source/Irrlicht/zlib/zutil.c",
        "source/Irrlicht/jpeglib/jaricom.c",
        "source/Irrlicht/jpeglib/jcapimin.c",
        ......@@ -248,80 +90,15 @@ project "irrlicht"
        "source/Irrlicht/libpng/pngwrite.c",
        "source/Irrlicht/libpng/pngwtran.c",
        "source/Irrlicht/libpng/pngwutil.c",
        "source/Irrlicht/aesGladman/aescrypt.cpp",
        "source/Irrlicht/aesGladman/aeskey.cpp",
        "source/Irrlicht/aesGladman/aestab.cpp",
        "source/Irrlicht/aesGladman/fileenc.cpp",
        "source/Irrlicht/aesGladman/hmac.cpp",
        "source/Irrlicht/aesGladman/prng.cpp",
        "source/Irrlicht/aesGladman/pwd2key.cpp",
        "source/Irrlicht/aesGladman/sha1.cpp",
        "source/Irrlicht/aesGladman/sha2.cpp",
        "source/Irrlicht/bzip2/blocksort.c",
        "source/Irrlicht/bzip2/bzcompress.c",
        "source/Irrlicht/bzip2/bzlib.c",
        "source/Irrlicht/bzip2/crctable.c",
        "source/Irrlicht/bzip2/decompress.c",
        "source/Irrlicht/bzip2/huffman.c",
        "source/Irrlicht/bzip2/randtable.c",
        "source/Irrlicht/CIrrDeviceConsole.cpp",
        "source/Irrlicht/CIrrDeviceFB.cpp",
        "source/Irrlicht/CIrrDeviceLinux.cpp",
        "source/Irrlicht/CIrrDeviceSDL.cpp",
        "source/Irrlicht/CIrrDeviceStub.cpp",
        "source/Irrlicht/CIrrDeviceWin32.cpp",
        "source/Irrlicht/CIrrDeviceWinCE.cpp",
        "source/Irrlicht/CAttributes.cpp",
        "source/Irrlicht/CFileList.cpp",
        "source/Irrlicht/CFileSystem.cpp",
        "source/Irrlicht/CLimitReadFile.cpp",
        "source/Irrlicht/CMemoryFile.cpp",
        "source/Irrlicht/CMountPointReader.cpp",
        "source/Irrlicht/CNPKReader.cpp",
        "source/Irrlicht/CPakReader.cpp",
        "source/Irrlicht/CReadFile.cpp",
        "source/Irrlicht/CTarReader.cpp",
        "source/Irrlicht/CWADReader.cpp",
        "source/Irrlicht/CWriteFile.cpp",
        "source/Irrlicht/CXMLReader.cpp",
        "source/Irrlicht/CXMLWriter.cpp",
        "source/Irrlicht/CZipReader.cpp",
        "source/Irrlicht/irrXML.cpp",
        "source/Irrlicht/CDefaultGUIElementFactory.cpp",
        "source/Irrlicht/CGUIButton.cpp",
        "source/Irrlicht/CGUICheckBox.cpp",
        "source/Irrlicht/CGUIColorSelectDialog.cpp",
        "source/Irrlicht/CGUIComboBox.cpp",
        "source/Irrlicht/CGUIContextMenu.cpp",
        "source/Irrlicht/CGUIEditBox.cpp",
        "source/Irrlicht/CGUIEnvironment.cpp",
        "source/Irrlicht/CGUIFileOpenDialog.cpp",
        "source/Irrlicht/CGUIFont.cpp",
        "source/Irrlicht/CGUIImage.cpp",
        "source/Irrlicht/CGUIImageList.cpp",
        "source/Irrlicht/CGUIInOutFader.cpp",
        "source/Irrlicht/CGUIListBox.cpp",
        "source/Irrlicht/CGUIMenu.cpp",
        "source/Irrlicht/CGUIMeshViewer.cpp",
        "source/Irrlicht/CGUIMessageBox.cpp",
        "source/Irrlicht/CGUIModalScreen.cpp",
        "source/Irrlicht/CGUIScrollBar.cpp",
        "source/Irrlicht/CGUISkin.cpp",
        "source/Irrlicht/CGUISpinBox.cpp",
        "source/Irrlicht/CGUISpriteBank.cpp",
        "source/Irrlicht/CGUIStaticText.cpp",
        "source/Irrlicht/CGUITabControl.cpp",
        "source/Irrlicht/CGUITable.cpp",
        "source/Irrlicht/CGUIToolBar.cpp",
        "source/Irrlicht/CGUITreeView.cpp",
        "source/Irrlicht/CGUIWindow.cpp" }
        "source/Irrlicht/aesGladman/*.h",
        "source/Irrlicht/aesGladman/*.cpp" }
        filter { "system:windows" }
        defines { "_IRR_WCHAR_FILESYSTEM" }
        includedirs { "$(DXSDK_DIR)include" }
        includedirs { "$(DXSDK_DIR)Include" }
        libdirs { "$(DXSDK_DIR)Lib/x86" }
        links { "imm32" }
        filter { "not system:windows" }
        filter { "system:linux" }
        links { "X11", "Xxf86vm" }
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment