Skip to content

Commit 68fcb7c

Browse files
iftodebogdaniftodebogdan
committed
GITechDemo:
*Fixed a typo in README.md Synesthesia3DTools: *Removed DevIL's ILUT module dependency in TextureCompiler, since it was never used
1 parent 82bfc28 commit 68fcb7c

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

‎GITechDemo/Code/AppMain/GITechDemo.vcxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
<CustomBuildStep />
146146
<PostBuildEvent>
147147
<Command>cd "$(SolutionDir)..\..\Build"
148-
echo.
149148
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_tools_win.py" $(Platform)
150149
echo.
151150
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_data_win.py" $(Platform)</Command>
@@ -181,7 +180,6 @@ call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\
181180
<CustomBuildStep />
182181
<PostBuildEvent>
183182
<Command>cd "$(SolutionDir)..\..\Build"
184-
echo.
185183
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_tools_win.py" $(Platform)
186184
echo.
187185
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_data_win.py" $(Platform)</Command>
@@ -223,7 +221,6 @@ call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\
223221
<CustomBuildStep />
224222
<PostBuildEvent>
225223
<Command>cd "$(SolutionDir)..\..\Build"
226-
echo.
227224
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_tools_win.py" $(Platform)
228225
echo.
229226
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_data_win.py" $(Platform)</Command>
@@ -263,7 +260,6 @@ call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\
263260
<CustomBuildStep />
264261
<PostBuildEvent>
265262
<Command>cd "$(SolutionDir)..\..\Build"
266-
echo.
267263
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_tools_win.py" $(Platform)
268264
echo.
269265
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_data_win.py" $(Platform)</Command>
@@ -304,7 +300,6 @@ call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\
304300
<CustomBuildStep />
305301
<PostBuildEvent>
306302
<Command>cd "$(SolutionDir)..\..\Build"
307-
echo.
308303
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_tools_win.py" $(Platform)
309304
echo.
310305
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_data_win.py" $(Platform)</Command>
@@ -345,7 +340,6 @@ call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\
345340
<CustomBuildStep />
346341
<PostBuildEvent>
347342
<Command>cd "$(SolutionDir)..\..\Build"
348-
echo.
349343
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_tools_win.py" $(Platform)
350344
echo.
351345
call "$(SolutionDir)..\..\Tools\Python27\python.exe" "$(SolutionDir)..\..\Build\build_data_win.py" $(Platform)</Command>

‎GITechDemo/Code/Tools/TextureCompiler.vcxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@
106106
<AdditionalDependencies>DevIL.lib;ILU.lib;ILUT.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
107107
</Link>
108108
<PostBuildEvent>
109-
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\*.dll" "$(OutDir)"</Command>
109+
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\DevIL.dll" "$(OutDir)"
110+
xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\ILU.dll" "$(OutDir)"</Command>
110111
<Message>Copy DLL dependencies</Message>
111112
</PostBuildEvent>
112113
<CustomBuildStep />
113114
<CustomBuildStep />
114115
<CustomBuildStep />
115116
<CustomBuildStep>
116117
<Command>DEL /F /Q "$(OutDir)\DevIL.dll"
117-
DEL /F /Q "$(OutDir)\ILU.dll"
118-
DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
118+
DEL /F /Q "$(OutDir)\ILU.dll"</Command>
119119
<Message>Deleting DLL dependencies</Message>
120120
<Outputs>dummy</Outputs>
121121
</CustomBuildStep>
@@ -135,16 +135,16 @@ DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
135135
<AdditionalDependencies>DevIL.lib;ILU.lib;ILUT.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
136136
</Link>
137137
<PostBuildEvent>
138-
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\*.dll" "$(OutDir)"</Command>
138+
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\DevIL.dll" "$(OutDir)"
139+
xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\ILU.dll" "$(OutDir)"</Command>
139140
<Message>Copy DLL dependencies</Message>
140141
</PostBuildEvent>
141142
<CustomBuildStep />
142143
<CustomBuildStep />
143144
<CustomBuildStep />
144145
<CustomBuildStep>
145146
<Command>DEL /F /Q "$(OutDir)\DevIL.dll"
146-
DEL /F /Q "$(OutDir)\ILU.dll"
147-
DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
147+
DEL /F /Q "$(OutDir)\ILU.dll"</Command>
148148
<Message>Deleting DLL dependencies</Message>
149149
<Outputs>dummy</Outputs>
150150
</CustomBuildStep>
@@ -168,16 +168,16 @@ DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
168168
<AdditionalDependencies>DevIL.lib;ILU.lib;ILUT.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
169169
</Link>
170170
<PostBuildEvent>
171-
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\*.dll" "$(OutDir)"</Command>
171+
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\DevIL.dll" "$(OutDir)"
172+
xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\ILU.dll" "$(OutDir)"</Command>
172173
<Message>Copy DLL dependencies</Message>
173174
</PostBuildEvent>
174175
<CustomBuildStep />
175176
<CustomBuildStep />
176177
<CustomBuildStep />
177178
<CustomBuildStep>
178179
<Command>DEL /F /Q "$(OutDir)\DevIL.dll"
179-
DEL /F /Q "$(OutDir)\ILU.dll"
180-
DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
180+
DEL /F /Q "$(OutDir)\ILU.dll"</Command>
181181
<Message>Deleting DLL dependencies</Message>
182182
<Outputs>dummy</Outputs>
183183
</CustomBuildStep>
@@ -201,16 +201,16 @@ DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
201201
<AdditionalDependencies>DevIL.lib;ILU.lib;ILUT.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
202202
</Link>
203203
<PostBuildEvent>
204-
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\*.dll" "$(OutDir)"</Command>
204+
<Command>xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\DevIL.dll" "$(OutDir)"
205+
xcopy /y /d "$(ProjectDir)External\DevIL\bin\$(Platform)\ILU.dll" "$(OutDir)"</Command>
205206
<Message>Copy DLL dependencies</Message>
206207
</PostBuildEvent>
207208
<CustomBuildStep />
208209
<CustomBuildStep />
209210
<CustomBuildStep />
210211
<CustomBuildStep>
211212
<Command>DEL /F /Q "$(OutDir)\DevIL.dll"
212-
DEL /F /Q "$(OutDir)\ILU.dll"
213-
DEL /F /Q "$(OutDir)\ILUT.dll"</Command>
213+
DEL /F /Q "$(OutDir)\ILU.dll"</Command>
214214
<Message>Deleting DLL dependencies</Message>
215215
<Outputs>dummy</Outputs>
216216
</CustomBuildStep>

‎GITechDemo/Code/Tools/TextureCompiler/TextureCompiler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using namespace Synesthesia3D;
77

88
#include <IL/il.h>
99
#include <IL/ilu.h>
10-
#include <IL/ilut.h>
10+
//#include <IL/ilut.h>
1111

1212
#include "../Common/Logging.h"
1313
#include "TextureCompiler.h"
@@ -470,8 +470,8 @@ void TextureCompiler::Run(int argc, char* argv[])
470470
const unsigned long long startTick = GetTickCount64();
471471

472472
if (ilGetInteger(IL_VERSION_NUM) != IL_VERSION ||
473-
iluGetInteger(ILU_VERSION_NUM) != ILU_VERSION ||
474-
ilutGetInteger(ILUT_VERSION_NUM) != ILUT_VERSION)
473+
iluGetInteger(ILU_VERSION_NUM) != ILU_VERSION /*||
474+
ilutGetInteger(ILUT_VERSION_NUM) != ILUT_VERSION*/)
475475
{
476476
Log << "[ERROR] Mismatch between DevIL binaries version and expected version\n";
477477
return;
@@ -481,7 +481,7 @@ void TextureCompiler::Run(int argc, char* argv[])
481481

482482
ilInit();
483483
iluInit();
484-
ilutInit();
484+
//ilutInit();
485485

486486
//ilEnable(IL_ORIGIN_SET);
487487
//ilSetInteger(IL_ORIGIN_MODE, IL_ORIGIN_UPPER_LEFT);

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You will need a PC running the Windows operating system (tested on 7 and 10, bot
3232
You will need Visual Studio 2017 in order to compile the code. You can [grab the free Community Edition](https://www.visualstudio.com/) from their official website. Older versions of Visual Studio, with older platform toolsets (i.e. pre-v141), should also work with minimal modifications, since GITechDemo was, until recently, compiled using the Visual Studio 2010 toolset (v100). If you do end up using another version of Visual Studio, make sure that all projects that link against Synesthesia3D are built with the same platform toolset as the latter, because of the presence of some STL objects on the DLL boundary (will be resolved at a later time).
3333

3434
###### Compiling from source code guide
35-
Open the solution file found at "GITechDemo/Code/Solutions/GITechDemo.sln", open the Solution Explorer and right-click on the project titled 'GITechDemo'. From the context menu, choose the option 'Set as StartUp Project'. Right-click it again, but this time choose the option 'Properties'. A new window will appear, titled 'GITechDemo Property Pages'. From the drop-down list named 'Configuration' choose the option 'All Configurations' and from the one named 'Platform' choose 'All Platforms'. Next, select 'Configuration Properties' > 'Debugging', from the list box on the left-hand side, and set the working directory to '..\..\Data'. Press F5 and click on 'Yes' when asked if you want to build the projects.
35+
Open the solution file found at "GITechDemo/Code/Solutions/GITechDemo.sln", open the Solution Explorer and right-click on the project titled 'GITechDemo'. From the context menu, choose the option 'Set as StartUp Project'. Right-click it again, but this time choose the option 'Properties'. A new window will appear, titled 'GITechDemo Property Pages'. From the drop-down list named 'Configuration' choose the option 'All Configurations' and from the one named 'Platform' choose 'All Platforms'. Next, select 'Configuration Properties' > 'Debugging', from the list box on the left-hand side, and set the working directory to '..\\..\Data'. Press F5 and click on 'Yes' when asked if you want to build the projects.
3636

3737
Congratulations! You've successfully built and ran GITechDemo! If you've encountered any problems along the way, be sure to [create an issue](https://github.com/iftodebogdan/GITechDemo/issues).
3838

0 commit comments

Comments
 (0)