Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed freetype-gl on windows compiler

Browse Source 
- deprecated ancient opengl extension code and replaced it with glew
- testing new font renderer on windows (still in progress need to fix newlines)
(now need to check the Linux build and possibly make adjustments)
This commit is contained in:
Mark Vejvoda 2011-11-18 08:28:42 +00:00
parent 0e9b4851fd
commit d0acde5d88
18 changed files with 111 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/windoze/g3d_viewer.vcproj
View File

@ -118,8 +118,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/arch:SSE2" AdditionalOptions="/arch:SSE2"
AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;..\..\source\glest_game\graphics;..\..\source\shared_lib\include\xml;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;..\..\source\glest_game\global;..\..\source\glest_game\sound;..\..\source\shared_lib\include\sound;..\..\source\glest_game\game;../../source/shared_lib/include/map;../../source/win32_deps/lpng141;..\..\source\glest_game\facilities" AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;..\..\source\glest_game\graphics;..\..\source\shared_lib\include\xml;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;..\..\source\glest_game\global;..\..\source\glest_game\sound;..\..\source\shared_lib\include\sound;..\..\source\glest_game\game;../../source/shared_lib/include/map;../../source/win32_deps/lpng141;..\..\source\glest_game\facilities;&quot;../../source/win32_deps/glew-1.7.0/include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB;UNICODE" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB;UNICODE;GLEW_STATIC"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="0" RuntimeLibrary="0"

12
mk/windoze/glest_game.vcproj
View File

@ -44,9 +44,9 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;$(NOINHERIT);../../source/win32_deps/libircclient/include" AdditionalIncludeDirectories="../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;../../source/win32_deps/libircclient/include;&quot;../../source/win32_deps/glew-1.7.0/include&quot;;$(NOINHERIT)"
AdditionalUsingDirectories="" AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB; UNICODE" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -74,7 +74,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib libcurl.lib ws2_32.lib libircclient.lib" AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib libcurl.lib ws2_32.lib libircclient.lib ftgl_static.lib freetype244MT.lib glew32s.lib"
OutputFile="$(OutDir)\megaglest.exe" OutputFile="$(OutDir)\megaglest.exe"
AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib" AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib"
IgnoreAllDefaultLibraries="false" IgnoreAllDefaultLibraries="false"
@ -137,9 +137,9 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;$(NOINHERIT);../../source/win32_deps/libircclient/include" AdditionalIncludeDirectories="../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;../../source/win32_deps/libircclient/include;&quot;../../source/win32_deps/glew-1.7.0/include&quot;;$(NOINHERIT)"
AdditionalUsingDirectories="" AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;GLEW_STATIC"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -163,7 +163,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib libcurl.lib ws2_32.lib libircclient.lib ftgl_static.lib freetype244MT.lib glew32s.lib" AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glew32s.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib libcurl.lib ws2_32.lib libircclient.lib ftgl_static.lib freetype244MT.lib"
OutputFile="$(OutDir)\megaglest.exe" OutputFile="$(OutDir)\megaglest.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib" AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib"

58
mk/windoze/shared_lib.vcproj
View File

@ -40,8 +40,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/lpng141;&quot;../../source/win32_deps/jpeg-8a&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;&quot;../../source/win32_deps/glew-1.7.0/include&quot;;../../source/shared_lib/include/graphics/md5;&quot;../../source/shared_lib/include/graphics/freetype-gl&quot;" AdditionalIncludeDirectories="../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/lpng141;&quot;../../source/win32_deps/jpeg-8a&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;&quot;../../source/win32_deps/glew-1.7.0/include&quot;;../../source/shared_lib/include/graphics/md5;&quot;../../source/shared_lib/include/graphics/freetype-gl&quot;;&quot;../../source/win32_deps/freetype-2.4.4/include&quot;;&quot;../../source/win32_deps/ftgl-2.1.3-rc5/src&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;STATICLIB;GLEW_STATIC" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;STATICLIB;GLEW_STATIC;USE_FREETYPEGL;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -70,7 +70,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="libstreflop.lib libcurl.lib glew32s.lib" AdditionalDependencies="libstreflop.lib libcurl.lib glew32s.lib freetype244MT.lib"
AdditionalLibraryDirectories=".\;..\..\source\win32_deps\lib;../../source/win32_deps/libircclient/build/lib" AdditionalLibraryDirectories=".\;..\..\source\win32_deps\lib;../../source/win32_deps/libircclient/build/lib"
/> />
<Tool <Tool
@ -121,7 +121,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/lpng141;&quot;../../source/win32_deps/jpeg-8a&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;&quot;../../source/win32_deps/ftgl-2.1.3-rc5/src&quot;;&quot;../../source/win32_deps/freetype-2.4.4/include&quot;;&quot;../../source/win32_deps/glew-1.7.0/include&quot;;../../source/shared_lib/include/graphics/md5;&quot;../../source/shared_lib/include/graphics/freetype-gl&quot;;$(NOINHERIT)" AdditionalIncludeDirectories="../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/lpng141;&quot;../../source/win32_deps/jpeg-8a&quot;;&quot;../../source/win32_deps/SDL-1.2.x/include&quot;;../../source/shared_lib/include/platform/sdl;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;&quot;../../source/win32_deps/curl-7.21.3/include&quot;;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;&quot;../../source/win32_deps/ftgl-2.1.3-rc5/src&quot;;&quot;../../source/win32_deps/freetype-2.4.4/include&quot;;&quot;../../source/win32_deps/glew-1.7.0/include&quot;;../../source/shared_lib/include/graphics/md5;&quot;../../source/shared_lib/include/graphics/freetype-gl&quot;;$(NOINHERIT)"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;GLEW_STATIC" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;USE_FREETYPEGL;GLEW_STATIC"
StringPooling="true" StringPooling="true"
ExceptionHandling="2" ExceptionHandling="2"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -146,7 +146,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalDependencies="libstreflop.lib libcurl.lib glew32s.lib" AdditionalDependencies="libstreflop.lib libcurl.lib glew32s.lib freetype244MT.lib"
AdditionalLibraryDirectories=".\;..\..\source\win32_deps\lib;../../source/win32_deps/libircclient/build/lib" AdditionalLibraryDirectories=".\;..\..\source\win32_deps\lib;../../source/win32_deps/libircclient/build/lib"
/> />
<Tool <Tool
@ -376,10 +376,6 @@
RelativePath="..\..\source\shared_lib\sources\platform\sdl\gl_wrap.cpp" RelativePath="..\..\source\shared_lib\sources\platform\sdl\gl_wrap.cpp"
> >
</File> </File>
<File
RelativePath="..\..\source\win32_deps\src\glprocs.c"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\sources\libircclient\src\libircclient.c" RelativePath="..\..\source\shared_lib\sources\libircclient\src\libircclient.c"
> >
@ -499,6 +495,10 @@
RelativePath="..\..\source\shared_lib\sources\graphics\md5\Md5Model.cpp" RelativePath="..\..\source\shared_lib\sources\graphics\md5\Md5Model.cpp"
> >
</File> </File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\md5\md5Texture.cpp"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\sources\graphics\md5\md5util.cpp" RelativePath="..\..\source\shared_lib\sources\graphics\md5\md5util.cpp"
> >
@ -535,10 +535,6 @@
RelativePath="..\..\source\shared_lib\sources\graphics\shader_manager.cpp" RelativePath="..\..\source\shared_lib\sources\graphics\shader_manager.cpp"
> >
</File> </File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\md5\Texture.cpp"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\sources\graphics\texture.cpp" RelativePath="..\..\source\shared_lib\sources\graphics\texture.cpp"
> >
@ -790,6 +786,14 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\edtaa3func.h"
>
</File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\font-manager.h"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\include\streflop\FPUSettings.h" RelativePath="..\..\source\shared_lib\include\streflop\FPUSettings.h"
> >
@ -822,6 +826,14 @@
RelativePath="..\..\source\shared_lib\include\map\map_preview.h" RelativePath="..\..\source\shared_lib\include\map\map_preview.h"
> >
</File> </File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\markup.h"
>
</File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\md5\md5Texture.h"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\include\streflop\Random.h" RelativePath="..\..\source\shared_lib\include\streflop\Random.h"
> >
@ -850,10 +862,30 @@
RelativePath="..\..\source\shared_lib\include\streflop\System.h" RelativePath="..\..\source\shared_lib\include\streflop\System.h"
> >
</File> </File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\texture-atlas.h"
>
</File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\texture-font.h"
>
</File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\texture-glyph.h"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\include\util\utf8.h" RelativePath="..\..\source\shared_lib\include\util\utf8.h"
> >
</File> </File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\vector.h"
>
</File>
<File
RelativePath="..\..\source\shared_lib\include\graphics\freetype-gl\vertex-buffer.h"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\include\streflop\X87DenormalSquasher.h" RelativePath="..\..\source\shared_lib\include\streflop\X87DenormalSquasher.h"
> >

6
source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h
View File

@ -37,8 +37,14 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
//#include "gl.h"
#include <GL/glew.h> #include <GL/glew.h>
//#include <GL/glu.h>
//#include "glext.h"
//typedef char GLchar; /* native character */
//#define GL_BOOL 0x8B56
#else #else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif

1
source/shared_lib/include/graphics/gl/opengl.h
View File

@ -12,6 +12,7 @@
#ifndef _SHARED_GRAPHICS_GL_OPENGL_H_ #ifndef _SHARED_GRAPHICS_GL_OPENGL_H_
#define _SHARED_GRAPHICS_GL_OPENGL_H_ #define _SHARED_GRAPHICS_GL_OPENGL_H_
#include <GL/glew.h>
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>

2
source/shared_lib/include/graphics/md5/Md5Model.h
View File

@ -33,7 +33,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#include "Mathlib.h" #include "Mathlib.h"
#include "Texture.h" #include "md5Texture.h"
namespace Shared { namespace Graphics { namespace md5 { namespace Shared { namespace Graphics { namespace md5 {

2
source/shared_lib/include/graphics/md5/TextureManager.h
View File

@ -18,7 +18,7 @@
#define __TEXTUREMANAGER_H__ #define __TEXTUREMANAGER_H__
#include "DataManager.h" #include "DataManager.h"
#include "Texture.h" #include "md5Texture.h"
namespace Shared { namespace Graphics { namespace md5 { namespace Shared { namespace Graphics { namespace md5 {

0
source/shared_lib/include/graphics/md5/Texture.h → source/shared_lib/include/graphics/md5/md5Texture.h
View File

9
source/shared_lib/include/platform/sdl/gl_wrap.h
View File

@ -15,9 +15,12 @@
#include <windows.h> #include <windows.h>
#include <GL/gl.h> #include <GL/glew.h>
#include <GL/glu.h> //#include "gl.h"
#include <glprocs.h>
//#include <GL/gl.h>
//#include <GL/glu.h>
//#include <glprocs.h>
#define GLEST_GLPROC(X, Y) inline X( static a= wglGetProcAddress(a); return a;) #define GLEST_GLPROC(X, Y) inline X( static a= wglGetProcAddress(a); return a;)

2
source/shared_lib/include/platform/sdl/platform_main.h
View File

@ -13,6 +13,8 @@
#include <SDL.h> #include <SDL.h>
#include <iostream> #include <iostream>
//#include "gl.h"
#include <GL/glew.h>
#include "leak_dumper.h" #include "leak_dumper.h"
#ifndef WIN32 #ifndef WIN32

5
source/shared_lib/sources/graphics/freetype-gl/texture-atlas.c
View File

@ -41,8 +41,11 @@
#include <windows.h> #include <windows.h>
#endif #endif
//#include "gl.h"
#include <GL/glew.h>
//#include <GL/gl.h> //#include <GL/gl.h>
#include <GL/glu.h> //#include <GL/glu.h>
//#include <glprocs.h> //#include <glprocs.h>
#include <string.h> #include <string.h>

1
source/shared_lib/sources/graphics/freetype-gl/texture-glyph.c
View File

@ -35,6 +35,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <GL/glew.h> #include <GL/glew.h>
//#include "gl.h"
#else #else
#include <GL/glu.h> #include <GL/glu.h>

14
source/shared_lib/sources/graphics/freetype-gl/vertex-buffer.c
View File

@ -36,7 +36,21 @@
#include <stdio.h> #include <stdio.h>
#include "vertex-buffer.h" #include "vertex-buffer.h"
#ifdef _WIN32
char * strndup(const char *old, size_t sz)
{
size_t len = strnlen (old, sz);
char *t = malloc(len + 1);
if (t != NULL) {
memcpy (t, old, len);
t[len] = '\0';
}
return t;
}
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
VertexBuffer * VertexBuffer *

3
source/shared_lib/sources/graphics/gl/texture_gl.cpp
View File

@ -25,6 +25,8 @@
using namespace std; using namespace std;
// Define FBO's (Frame Buffer Objects) for win32 // Define FBO's (Frame Buffer Objects) for win32
/*
#ifdef WIN32 #ifdef WIN32
#define GL_FRAMEBUFFER_EXT 0x8D40 #define GL_FRAMEBUFFER_EXT 0x8D40
@ -63,6 +65,7 @@ PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT = NULL;
PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT = NULL; PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT = NULL;
#endif #endif
*/
namespace Shared { namespace Graphics { namespace Gl { namespace Shared { namespace Graphics { namespace Gl {

7
source/shared_lib/sources/graphics/md5/GlErrors.cpp
View File

@ -20,8 +20,11 @@
#include <windows.h> #include <windows.h>
#endif // _WIN32 #endif // _WIN32
#include <GL/gl.h> //#include "gl.h"
#include <GL/glu.h> #include <GL/glew.h>
//#include <GL/gl.h>
//#include <GL/glu.h>
#include <iostream> #include <iostream>
#include "GlErrors.h" #include "GlErrors.h"

2
source/shared_lib/sources/graphics/md5/Md5Model.cpp
View File

@ -26,7 +26,7 @@
#include <iterator> #include <iterator>
#include <algorithm> #include <algorithm>
#include "Texture.h" #include "md5Texture.h"
#include "ArbProgram.h" #include "ArbProgram.h"
#include "ShaderManager.h" #include "ShaderManager.h"
#include "Md5Model.h" #include "Md5Model.h"

10
source/shared_lib/sources/graphics/md5/Texture.cpp → source/shared_lib/sources/graphics/md5/md5Texture.cpp
View File

@ -25,7 +25,7 @@
#include <stdexcept> #include <stdexcept>
#include "GlErrors.h" #include "GlErrors.h"
#include "Texture.h" #include "md5Texture.h"
#include "Image.h" #include "Image.h"
namespace Shared { namespace Graphics { namespace md5 { namespace Shared { namespace Graphics { namespace md5 {
@ -219,8 +219,8 @@ Texture2D::create (const Image *img, TextureFlags flags)
mipWidth, mipHeight, 0, mipSize, mipWidth, mipHeight, 0, mipSize,
img->pixels () + offset); img->pixels () + offset);
mipWidth = std::max (mipWidth >> 1, 1); mipWidth = max (mipWidth >> 1, 1);
mipHeight = std::max (mipHeight >> 1, 1); mipHeight = max (mipHeight >> 1, 1);
offset += mipSize; offset += mipSize;
} }
@ -492,8 +492,8 @@ TextureCubeMap::create (const vector<ImagePtr> &faces, TextureFlags flags)
mipWidth, mipHeight, 0, mipSize, mipWidth, mipHeight, 0, mipSize,
img->pixels () + offset); img->pixels () + offset);
mipWidth = std::max (mipWidth >> 1, 1); mipWidth = max (mipWidth >> 1, 1);
mipHeight = std::max (mipHeight >> 1, 1); mipHeight = max (mipHeight >> 1, 1);
offset += mipSize; offset += mipSize;
} }

8
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@ -161,6 +161,14 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
SDL_WM_GrabInput(SDL_GRAB_OFF); SDL_WM_GrabInput(SDL_GRAB_OFF);
} }
GLuint err = glewInit();
if (GLEW_OK != err) {
fprintf(stderr, "Error [main]: glewInit failed: %s\n", glewGetErrorString(err));
//return 1;
throw std::runtime_error((char *)glewGetErrorString(err));
}
} }
void PlatformContextGl::end() { void PlatformContextGl::end() {