Skip to content

D
deprecated-irrlicht-mac
Commit f8ce8a1e authored by hybrid's avatar hybrid
Browse files
Options

Adapt jpeg changes in other project files. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2973 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 226bc755
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 80 deletions
source/Irrlicht/Irrlicht-gcc.cbp
View file @ f8ce8a1e
......@@ -423,6 +423,7 @@
<Add alias="All" targets="Win32 - Debug - dll;Win32 - Release - accurate math - dll;Win32 - Release - fast math - dll;" />
</VirtualTargets>
<Unit filename="../../changes.txt" />
<Unit filename="../../include/EAttributes.h" />
<Unit filename="../../include/ECullingTypes.h" />
<Unit filename="../../include/EDebugSceneTypes.h" />
<Unit filename="../../include/EDriverTypes.h" />
......@@ -436,7 +437,6 @@
<Unit filename="../../include/IAnimatedMeshSceneNode.h" />
<Unit filename="../../include/IAttributeExchangingObject.h" />
<Unit filename="../../include/IAttributes.h" />
<Unit filename="../../include/EAttributes.h" />
<Unit filename="../../include/IBillboardSceneNode.h" />
<Unit filename="../../include/IBoneSceneNode.h" />
<Unit filename="../../include/ICameraSceneNode.h" />
......@@ -570,7 +570,6 @@
<Unit filename="CAttributeImpl.h" />
<Unit filename="CAttributes.cpp" />
<Unit filename="CAttributes.h" />
<Unit filename="IAttribute.h" />
<Unit filename="CB3DMeshFileLoader.cpp" />
<Unit filename="CB3DMeshFileLoader.h" />
<Unit filename="CBSPMeshFileLoader.cpp" />
......@@ -943,6 +942,7 @@
<Unit filename="CZBuffer.h" />
<Unit filename="CZipReader.cpp" />
<Unit filename="CZipReader.h" />
<Unit filename="IAttribute.h" />
<Unit filename="IBurningShader.cpp" />
<Unit filename="IBurningShader.h" />
<Unit filename="IDepthBuffer.h" />
......@@ -961,12 +961,16 @@
<Unit filename="glext.h" />
<Unit filename="irrXML.cpp" />
<Unit filename="jpeglib/cderror.h" />
<Unit filename="jpeglib/jaricom.c">
<Unit filename="jpeglib/jcapimin.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jcapistd.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jcarith.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jccoefct.c">
<Option compilerVar="CC" />
</Unit>
......@@ -999,9 +1003,6 @@
<Unit filename="jpeglib/jcparam.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jcphuff.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jcprepct.c">
<Option compilerVar="CC" />
</Unit>
......@@ -1017,6 +1018,9 @@
<Unit filename="jpeglib/jdapistd.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jdarith.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jdatadst.c">
<Option compilerVar="CC" />
</Unit>
......@@ -1052,9 +1056,6 @@
<Unit filename="jpeglib/jdmerge.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jdphuff.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jdpostct.c">
<Option compilerVar="CC" />
</Unit>
......@@ -1086,9 +1087,6 @@
<Unit filename="jpeglib/jidctint.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jidctred.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jpeglib/jinclude.h" />
<Unit filename="jpeglib/jmemmgr.c">
<Option compilerVar="CC" />
......
source/Irrlicht/Irrlicht.dev
View file @ f8ce8a1e
......@@ -3320,7 +3320,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit330]
FileName=jpeglib\jcphuff.c
FileName=jpeglib\jcarith.c
Folder=Irrlicht/extern/jpeglib
Compile=1
CompileCpp=0
......@@ -3510,7 +3510,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit349]
FileName=jpeglib\jdphuff.c
FileName=jpeglib\jdarith.c
Folder=Irrlicht/extern/jpeglib
Compile=1
CompileCpp=0
......@@ -3630,7 +3630,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit361]
FileName=jpeglib\jidctred.c
FileName=jpeglib\jaricom.c
Folder=Irrlicht/extern/jpeglib
Compile=1
CompileCpp=0
......@@ -6337,3 +6337,4 @@ Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
source/Irrlicht/Irrlicht7.1.vcproj
View file @ f8ce8a1e
......@@ -558,13 +558,13 @@
<Filter
Name="io">
<File
RelativePath=".\..\..\include\IAttributeExchangingObject.h">
RelativePath=".\..\..\include\EAttributes.h">
</File>
<File
RelativePath=".\..\..\include\IAttributes.h">
RelativePath=".\..\..\include\IAttributeExchangingObject.h">
</File>
<File
RelativePath=".\..\..\include\EAttributes.h">
RelativePath=".\..\..\include\IAttributes.h">
</File>
<File
RelativePath=".\..\..\include\IFileList.h">
......@@ -1945,9 +1945,6 @@
<File
RelativePath=".\CAttributes.h">
</File>
<File
RelativePath=".\IAttribute.h">
</File>
<File
RelativePath=".\CFileList.cpp">
</File>
......@@ -2029,6 +2026,9 @@
<File
RelativePath=".\CZipReader.h">
</File>
<File
RelativePath=".\IAttribute.h">
</File>
<File
RelativePath=".\irrXML.cpp">
</File>
......@@ -2150,12 +2150,18 @@
<File
RelativePath="jpeglib\cderror.h">
</File>
<File
RelativePath="jpeglib\jaricom.c">
</File>
<File
RelativePath="jpeglib\jcapimin.c">
</File>
<File
RelativePath="jpeglib\jcapistd.c">
</File>
<File
RelativePath="jpeglib\jcarith.c">
</File>
<File
RelativePath="jpeglib\jccoefct.c">
</File>
......@@ -2192,9 +2198,6 @@
<File
RelativePath="jpeglib\jcparam.c">
</File>
<File
RelativePath="jpeglib\jcphuff.c">
</File>
<File
RelativePath="jpeglib\jcprepct.c">
</File>
......@@ -2210,6 +2213,9 @@
<File
RelativePath="jpeglib\jdapistd.c">
</File>
<File
RelativePath="jpeglib\jdarith.c">
</File>
<File
RelativePath="jpeglib\jdatadst.c">
</File>
......@@ -2249,9 +2255,6 @@
<File
RelativePath="jpeglib\jdmerge.c">
</File>
<File
RelativePath="jpeglib\jdphuff.c">
</File>
<File
RelativePath="jpeglib\jdpostct.c">
</File>
......@@ -2285,9 +2288,6 @@
<File
RelativePath="jpeglib\jidctint.c">
</File>
<File
RelativePath="jpeglib\jidctred.c">
</File>
<File
RelativePath="jpeglib\jinclude.h">
</File>
......
source/Irrlicht/Irrlicht8.0.vcproj
View file @ f8ce8a1e
......@@ -786,15 +786,15 @@
Name="io"
>
<File
RelativePath=".\..\..\include\IAttributeExchangingObject.h"
RelativePath=".\..\..\include\EAttributes.h"
>
</File>
<File
RelativePath=".\..\..\include\IAttributes.h"
RelativePath=".\..\..\include\IAttributeExchangingObject.h"
>
</File>
<File
RelativePath=".\..\..\include\EAttributes.h"
RelativePath=".\..\..\include\IAttributes.h"
>
</File>
<File
......@@ -2714,10 +2714,6 @@
RelativePath="CAttributes.h"
>
</File>
<File
RelativePath="IAttribute.h"
>
</File>
<File
RelativePath="CFileList.cpp"
>
......@@ -2743,11 +2739,11 @@
>
</File>
<File
RelativePath=".\CMemoryFile.cpp"
RelativePath="CMemoryFile.cpp"
>
</File>
<File
RelativePath=".\CMemoryFile.h"
RelativePath="CMemoryFile.h"
>
</File>
<File
......@@ -2787,7 +2783,7 @@
>
</File>
<File
RelativePath=".\CTarReader.cpp"
RelativePath="CTarReader.cpp"
>
</File>
<File
......@@ -2830,6 +2826,10 @@
RelativePath="CZipReader.h"
>
</File>
<File
RelativePath="IAttribute.h"
>
</File>
<File
RelativePath="irrXML.cpp"
>
......@@ -3000,6 +3000,10 @@
RelativePath="jpeglib\cderror.h"
>
</File>
<File
RelativePath="jpeglib\jaricom.c"
>
</File>
<File
RelativePath="jpeglib\jcapimin.c"
>
......@@ -3008,6 +3012,10 @@
RelativePath="jpeglib\jcapistd.c"
>
</File>
<File
RelativePath="jpeglib\jcarith.c"
>
</File>
<File
RelativePath="jpeglib\jccoefct.c"
>
......@@ -3056,10 +3064,6 @@
RelativePath="jpeglib\jcparam.c"
>
</File>
<File
RelativePath="jpeglib\jcphuff.c"
>
</File>
<File
RelativePath="jpeglib\jcprepct.c"
>
......@@ -3080,6 +3084,10 @@
RelativePath="jpeglib\jdapistd.c"
>
</File>
<File
RelativePath="jpeglib\jdarith.c"
>
</File>
<File
RelativePath="jpeglib\jdatadst.c"
>
......@@ -3132,10 +3140,6 @@
RelativePath="jpeglib\jdmerge.c"
>
</File>
<File
RelativePath="jpeglib\jdphuff.c"
>
</File>
<File
RelativePath="jpeglib\jdpostct.c"
>
......@@ -3180,10 +3184,6 @@
RelativePath="jpeglib\jidctint.c"
>
</File>
<File
RelativePath="jpeglib\jidctred.c"
>
</File>
<File
RelativePath="jpeglib\jinclude.h"
>
......
source/Irrlicht/Irrlicht9.0.vcproj
View file @ f8ce8a1e
......@@ -2710,7 +2710,7 @@
>
</File>
<File
RelativePath=".\jpeglib\jaricom.c"
RelativePath="jpeglib\jaricom.c"
>
</File>
<File
......@@ -2722,7 +2722,7 @@
>
</File>
<File
RelativePath=".\jpeglib\jcarith.c"
RelativePath="jpeglib\jcarith.c"
>
</File>
<File
......@@ -2794,7 +2794,7 @@
>
</File>
<File
RelativePath=".\jpeglib\jdarith.c"
RelativePath="jpeglib\jdarith.c"
>
</File>
<File
......
source/Irrlicht/Irrlicht_mobile6.vcproj
View file @ f8ce8a1e
......@@ -521,15 +521,15 @@
Name="io"
>
<File
RelativePath="..\..\include\IAttributeExchangingObject.h"
RelativePath="..\..\include\EAttributes.h"
>
</File>
<File
RelativePath="..\..\include\IAttributes.h"
RelativePath="..\..\include\IAttributeExchangingObject.h"
>
</File>
<File
RelativePath="..\..\include\EAttributes.h"
RelativePath="..\..\include\IAttributes.h"
>
</File>
<File
......@@ -2349,10 +2349,6 @@
RelativePath="CAttributes.h"
>
</File>
<File
RelativePath="IAttribute.h"
>
</File>
<File
RelativePath="CFileList.cpp"
>
......@@ -2461,6 +2457,10 @@
RelativePath="CZipReader.h"
>
</File>
<File
RelativePath="IAttribute.h"
>
</File>
<File
RelativePath="irrXML.cpp"
>
......@@ -2639,6 +2639,10 @@
RelativePath="jpeglib\cderror.h"
>
</File>
<File
RelativePath="jpeglib\jaricom.c"
>
</File>
<File
RelativePath="jpeglib\jcapimin.c"
>
......@@ -2647,6 +2651,10 @@
RelativePath="jpeglib\jcapistd.c"
>
</File>
<File
RelativePath="jpeglib\jcarith.c"
>
</File>
<File
RelativePath="jpeglib\jccoefct.c"
>
......@@ -2695,10 +2703,6 @@
RelativePath="jpeglib\jcparam.c"
>
</File>
<File
RelativePath="jpeglib\jcphuff.c"
>
</File>
<File
RelativePath="jpeglib\jcprepct.c"
>
......@@ -2719,6 +2723,10 @@
RelativePath="jpeglib\jdapistd.c"
>
</File>
<File
RelativePath="jpeglib\jdarith.c"
>
</File>
<File
RelativePath="jpeglib\jdatadst.c"
>
......@@ -2771,10 +2779,6 @@
RelativePath="jpeglib\jdmerge.c"
>
</File>
<File
RelativePath="jpeglib\jdphuff.c"
>
</File>
<File
RelativePath="jpeglib\jdpostct.c"
>
......@@ -2819,10 +2823,6 @@
RelativePath="jpeglib\jidctint.c"
>
</File>
<File
RelativePath="jpeglib\jidctred.c"
>
</File>
<File
RelativePath="jpeglib\jinclude.h"
>
......
source/Irrlicht/Irrlicht_xbox.vcproj
View file @ f8ce8a1e
......@@ -274,13 +274,13 @@
RelativePath="..\..\include\IAnimatedMeshSceneNode.h">
</File>
<File
RelativePath="..\..\include\IAttributeExchangingObject.h">
RelativePath="..\..\include\EAttributes.h">
</File>
<File
RelativePath="..\..\include\IAttributes.h">
RelativePath="..\..\include\IAttributeExchangingObject.h">
</File>
<File
RelativePath="..\..\include\EAttributes.h">
RelativePath="..\..\include\IAttributes.h">
</File>
<File
RelativePath="..\..\include\IBillboardSceneNode.h">
......@@ -879,9 +879,6 @@
<File
RelativePath=".\CAttributes.h">
</File>
<File
RelativePath=".\IAttribute.h">
</File>
<File
RelativePath=".\CColorConverter.cpp">
</File>
......@@ -1380,6 +1377,9 @@
<File
RelativePath=".\glxext.h">
</File>
<File
RelativePath=".\IAttribute.h">
</File>
<File
RelativePath=".\IBurningShader.cpp">
</File>
......
source/Irrlicht/SConstruct
View file @ f8ce8a1e
......@@ -54,7 +54,7 @@ for fileName in ZLIBNAMES:
ZLIBOBJ += [ZLIB_PREFIX + fileName];
JPEGLIB_PREFIX = 'jpeglib/';
JPEGLIBNAMES = ['jcapimin.c', 'jcapistd.c', 'jccoefct.c', 'jccolor.c', 'jcdctmgr.c', 'jchuff.c', 'jcinit.c', 'jcmainct.c', 'jcmarker.c', 'jcmaster.c', 'jcomapi.c', 'jcparam.c', 'jcphuff.c', 'jcprepct.c', 'jcsample.c', 'jctrans.c', 'jdapimin.c', 'jdapistd.c', 'jdatadst.c', 'jdatasrc.c', 'jdcoefct.c', 'jdcolor.c', 'jddctmgr.c', 'jdhuff.c', 'jdinput.c', 'jdmainct.c', 'jdmarker.c', 'jdmaster.c', 'jdmerge.c', 'jdphuff.c', 'jdpostct.c', 'jdsample.c', 'jdtrans.c', 'jerror.c', 'jfdctflt.c', 'jfdctfst.c', 'jfdctint.c', 'jidctflt.c', 'jidctfst.c', 'jidctint.c', 'jidctred.c', 'jmemmgr.c', 'jmemnobs.c', 'jquant1.c', 'jquant2.c', 'jutils.c'];
JPEGLIBNAMES = ['jaricom.c', 'jcapimin.c', 'jcapistd.c', 'jcarith.c', 'jccoefct.c', 'jccolor.c', 'jcdctmgr.c', 'jchuff.c', 'jcinit.c', 'jcmainct.c', 'jcmarker.c', 'jcmaster.c', 'jcomapi.c', 'jcparam.c', 'jcprepct.c', 'jcsample.c', 'jctrans.c', 'jdapimin.c', 'jdapistd.c', 'jdarith.c', 'jdatadst.c', 'jdatasrc.c', 'jdcoefct.c', 'jdcolor.c', 'jddctmgr.c', 'jdhuff.c', 'jdinput.c', 'jdmainct.c', 'jdmarker.c', 'jdmaster.c', 'jdmerge.c', 'jdpostct.c', 'jdsample.c', 'jdtrans.c', 'jerror.c', 'jfdctflt.c', 'jfdctfst.c', 'jfdctint.c', 'jidctflt.c', 'jidctfst.c', 'jidctint.c', 'jmemmgr.c', 'jmemnobs.c', 'jquant1.c', 'jquant2.c', 'jutils.c'];
JPEGLIBOBJ = [];
for fileName in JPEGLIBNAMES:
JPEGLIBOBJ += [JPEGLIB_PREFIX + fileName];
......
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