diff --git a/mk/windoze/g3d_viewer.vcxproj b/mk/windoze/g3d_viewer.vcxproj
index 666b7371..d2fe191a 100644
--- a/mk/windoze/g3d_viewer.vcxproj
+++ b/mk/windoze/g3d_viewer.vcxproj
@@ -84,8 +84,8 @@
/arch:SSE2 %(AdditionalOptions)
- "..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\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;"..\..\source\win32_deps\wxWidgets-2.8.10\include";..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;"../../source/win32_deps/SDL-1.2.x/include";"../../source/win32_deps/curl-7.21.3/include";..\..\source\glest_game\graphics;..\..\source\shared_lib\include\xml;"../../source/win32_deps/xerces-c-3.0.1/src";..\..\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;"../../source/win32_deps/glew-1.7.0/include";%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB;UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)
+ ..\..\source\windows_deps\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\graphics\gl;..\..\source\windows_deps\include;..\..\source\shared_lib\include\graphics;..\..\source\windows_deps\wxWidgets-2.9.3\include;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/curl-7.21.3/include;..\..\source\glest_game\graphics;..\..\source\shared_lib\include\xml;../../source/windows_deps/xerces-c-3.1.1/src;..\..\source\glest_game\global;..\..\source\glest_game\sound;..\..\source\shared_lib\include\sound;..\..\source\glest_game\game;../../source/shared_lib/include/map;../../source/windows_deps/lpng1510;..\..\source\glest_game\facilities;../../source/windows_deps/glew-1.7.0/include;..\..\source\shared_lib\include\xml\rapidxml;../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories)
+ _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
Async
MultiThreaded
@@ -97,13 +97,15 @@
c:\temp\release\$(TargetName).pch
Level3
ProgramDatabase
+ true
+ Fast
- wxbase28.lib;wxbase28_net.lib;wxbase28_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw28_adv.lib;wxmsw28_aui.lib;wxmsw28_core.lib;wxmsw28_gl.lib;wxmsw28_html.lib;wxmsw28_media.lib;wxmsw28_qa.lib;wxmsw28_richtext.lib;wxmsw28_xrc.lib;wxregex.lib;wxtiff.lib;wxzlib.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3.lib;libpng.lib;%(AdditionalDependencies)
- $(OutDir)$(ProjectName).exe
- ../../source/win32_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;%(AdditionalLibraryDirectories)
+ wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;%(AdditionalDependencies)
+ $(OutDir)\megaglest_g3dviewer.exe
+ ../../source/windows_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../source/windows_deps/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories)
true
- Windows
+ Console
diff --git a/mk/windoze/glest_editor.vcxproj b/mk/windoze/glest_editor.vcxproj
index eaa397fc..295fb01f 100644
--- a/mk/windoze/glest_editor.vcxproj
+++ b/mk/windoze/glest_editor.vcxproj
@@ -84,8 +84,8 @@
/arch:SSE2 %(AdditionalOptions)
- ..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc;..\..\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;..\..\source\win32_deps\wxWidgets-2.8.10\include;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/win32_deps/SDL-1.2.x/include;../../source/win32_deps/curl-7.21.3/include;../../source/shared_lib/include/map;..\..\source\glest_game\global;..\..\source\glest_game\game;..\..\source\glest_game\facilities;%(AdditionalIncludeDirectories)
- MWIN;__WXMSW__;CURL_STATICLIB;%(PreprocessorDefinitions)
+ ..\..\source\windows_deps\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\windows_deps\include;..\..\source\shared_lib\include\graphics;..\..\source\windows_deps\wxWidgets-2.9.3\include;..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;..\..\source\glest_game\global;..\..\source\glest_game\game;..\..\source\glest_game\facilities;..\..\source\shared_lib\include\xml;..\..\source\shared_lib\include\xml\rapidxml;../../source/windows_deps/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories)
+ _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
Async
MultiThreaded
@@ -99,9 +99,9 @@
ProgramDatabase
- wxbase28.lib;wxbase28_net.lib;wxbase28_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw28_adv.lib;wxmsw28_aui.lib;wxmsw28_core.lib;wxmsw28_gl.lib;wxmsw28_html.lib;wxmsw28_media.lib;wxmsw28_qa.lib;wxmsw28_richtext.lib;wxmsw28_xrc.lib;wxpng.lib;wxregex.lib;wxtiff.lib;wxzlib.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;%(AdditionalDependencies)
- $(OutDir)$(ProjectName).exe
- ../../source/win32_deps/lib;../../build/$(Configuration)/libglest;%(AdditionalLibraryDirectories)
+ wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;%(AdditionalDependencies)
+ $(OutDir)\megaglest_editor.exe
+ ../../source/windows_deps/lib;../../build/$(Configuration)/libglest;%(AdditionalLibraryDirectories)
true
Windows
@@ -141,9 +141,7 @@
-
-
@@ -152,7 +150,6 @@
-
diff --git a/mk/windoze/glest_game.vcxproj b/mk/windoze/glest_game.vcxproj
index 40ef275c..91d04206 100644
--- a/mk/windoze/glest_game.vcxproj
+++ b/mk/windoze/glest_game.vcxproj
@@ -106,23 +106,23 @@
Speed
true
false
- ../../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;../../source/win32_deps/xerces-c-3.0.1/src;../../source/win32_deps/SDL-1.2.x/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/win32_deps/openal-soft-1.12.854/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/win32_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/win32_deps/libircclient/include;../../source/win32_deps/glew-1.7.0/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/shared_lib/include/xml/rapidxml;../../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/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/SDL-1.2.15/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/windows_deps/libircclient/include;../../source/windows_deps/glew-1.7.0/include
%(AdditionalUsingDirectories)
- WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;GLEW_STATIC%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
Async
MultiThreaded
true
StreamingSIMDExtensions
- Precise
+ Fast
$(IntDir)$(ProjectName).pdb
Level3
ProgramDatabase
4018;4244;4250;4503;%(DisableSpecificWarnings)
- 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)
- ../../source/win32_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;../../source/win32_deps/libircclient/build/lib;%(AdditionalLibraryDirectories)
+ dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;%(AdditionalDependencies)
+ ../../source/windows_deps/lib;../../build/$(Configuration)/libglest;../../source/shared_lib/sources/streflop/libstreflop;$(DXSDK_DIR)/lib/x86;../../source/windows_deps/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories)
%(IgnoreSpecificDefaultLibraries)
true
Console
@@ -136,6 +136,9 @@
NotSet
+ $(OutDir)\megaglest.exe
+ true
+ true
@@ -222,6 +225,7 @@
+
@@ -238,6 +242,7 @@
+
@@ -311,12 +316,15 @@
+
+
+
@@ -326,6 +334,7 @@
+
@@ -351,6 +360,7 @@
+
diff --git a/mk/windoze/shared_lib.vcxproj b/mk/windoze/shared_lib.vcxproj
index e545d451..8e1e4ce6 100644
--- a/mk/windoze/shared_lib.vcxproj
+++ b/mk/windoze/shared_lib.vcxproj
@@ -94,8 +94,8 @@
true
Speed
false
- ../../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;"../../source/win32_deps/xerces-c-3.0.1/src";"../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude";../../source/win32_deps/lpng141;"../../source/win32_deps/jpeg-8a";"../../source/win32_deps/SDL-1.2.x/include";../../source/shared_lib/include/platform/sdl;"../../source/win32_deps/openal-soft-1.12.854/include";../../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;"../../source/win32_deps/curl-7.21.3/include";../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;"../../source/win32_deps/ftgl-2.1.3-rc5/src";"../../source/win32_deps/freetype-2.4.4/include";"../../source/win32_deps/glew-1.7.0/include";../../source/shared_lib/include/graphics/md5;"../../source/shared_lib/include/graphics/freetype-gl";../../source/shared_lib/include/streflop/softfloat;
- 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%(PreprocessorDefinitions)
+ ../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../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/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/xerces-c-3.1.1/src/xercesc/xinclude;../../source/windows_deps/lpng1510;../../source/windows_deps/jpeg-8a;../../source/windows_deps/SDL-1.2.15/include;../../source/windows_deps/openal-soft-1.14/include;../../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;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/shared_lib/include/platform/miniupnpc;../../source/shared_lib/include/libircclient/include;../../source/shared_lib/include/feathery_ftp;../../source/windows_deps/ftgl-2.1.3-rc5/src;../../source/windows_deps/freetype-2.4.4/include;../../source/windows_deps/glew-1.7.0/include;../../source/shared_lib/include/graphics/md5;../../source/shared_lib/include/graphics/freetype-gl;../../source/shared_lib/include/streflop/softfloat;../../source/shared_lib/include/xml/rapidxml;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/platform/win32
+ 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;XERCES_STATIC_LIBRARY;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
Async
MultiThreaded
@@ -107,10 +107,11 @@
Level3
ProgramDatabase
4250;%(DisableSpecificWarnings)
+ true
- libstreflop.lib;libcurl.lib;%(AdditionalDependencies)
- .\;..\..\source\win32_deps\lib;../../source/win32_deps/libircclient/build/lib;%(AdditionalLibraryDirectories)
+ libstreflop.lib;libcurl.lib;glew32s.lib;freetype244MT.lib;%(AdditionalDependencies)
+ .\;..\..\source\windows_deps\lib;%(AdditionalLibraryDirectories)
@@ -166,9 +167,30 @@
CompileAsC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -206,6 +228,7 @@
+
@@ -245,6 +268,7 @@
+
@@ -332,7 +356,6 @@
-
diff --git a/mk/windoze/xml2g.vcxproj b/mk/windoze/xml2g.vcxproj
index 8c8a6472..9c955344 100644
--- a/mk/windoze/xml2g.vcxproj
+++ b/mk/windoze/xml2g.vcxproj
@@ -69,7 +69,7 @@
MaxSpeed
true
- ..\..\source\win32_deps\libxml2-2.7.7\include;%(AdditionalIncludeDirectories)
+ ..\..\source\windows_deps\libxml2-2.7.7\include;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
MultiThreaded
true
@@ -80,7 +80,7 @@
wsock32.lib;libxml2_a.lib;%(AdditionalDependencies)
- ..\..\source\win32_deps\libxml2-2.7.7\win32\bin.msvc;%(AdditionalLibraryDirectories)
+ ..\..\source\windows_deps\lib\;%(AdditionalLibraryDirectories)
true
Console
true
diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index c89fd0af..b17ab894 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -528,19 +528,26 @@ void MainWindow::setupStartupSettings() {
}
MainWindow::~MainWindow(){
- delete renderer;
- renderer = NULL;
- delete model;
- model = NULL;
delete timer;
timer = NULL;
- delete glCanvas;
+
+ delete model;
+ model = NULL;
+
+ delete renderer;
+ renderer = NULL;
+
+ //delete glCanvas;
+ if(glCanvas) glCanvas->Destroy();
glCanvas = NULL;
}
void MainWindow::init() {
-#if wxCHECK_VERSION(2, 9, 1)
+
+#if wxCHECK_VERSION(2, 9, 3)
+ glCanvas->setCurrentGLContext();
+#elif wxCHECK_VERSION(2, 9, 1)
#else
glCanvas->SetCurrent();
@@ -700,7 +707,21 @@ void MainWindow::onClose(wxCloseEvent &event){
//printf("OnClose about to END\n");
//fflush(stdout);
- delete this;
+ delete timer;
+ timer = NULL;
+
+ delete model;
+ model = NULL;
+
+ delete renderer;
+ renderer = NULL;
+
+ //delete glCanvas;
+ if(glCanvas) glCanvas->Destroy();
+ glCanvas = NULL;
+
+ //delete this;
+ this->Destroy();
}
// for the mousewheel
diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h
index 8683c6b1..5690ab1c 100644
--- a/source/g3d_viewer/main.h
+++ b/source/g3d_viewer/main.h
@@ -12,8 +12,12 @@
#ifndef _SHADER_G3DVIEWER_MAIN_H_
#define _SHADER_G3DVIEWER_MAIN_H_
-#include
+#ifdef WIN32
+ #include
+ #include
+#endif
+#include
#include
#include
#include
diff --git a/source/g3d_viewer/renderer.h b/source/g3d_viewer/renderer.h
index 243dd9df..7f053ac5 100644
--- a/source/g3d_viewer/renderer.h
+++ b/source/g3d_viewer/renderer.h
@@ -12,12 +12,10 @@
#ifndef _SHADER_G3DVIEWER_RENDERER_H_
#define _SHADER_G3DVIEWER_RENDERER_H_
-/*
-#include "model_renderer.h"
-#include "texture_manager.h"
-#include "model.h"
-#include "texture.h"
-*/
+#ifdef WIN32
+ #include
+ #include
+#endif
#include "model_renderer.h"
#include "texture_manager.h"
diff --git a/source/glest_game/ai/ai_rule.h b/source/glest_game/ai/ai_rule.h
index a9a6d23d..ff604015 100644
--- a/source/glest_game/ai/ai_rule.h
+++ b/source/glest_game/ai/ai_rule.h
@@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_AIRULE_H_
#define _GLEST_GAME_AIRULE_H_
-#include
+#ifdef WIN32
+ #include
+ #include
+#endif
+#include
#include "vec.h"
#include "skill_type.h"
#include "leak_dumper.h"
diff --git a/source/glest_game/ai/annotated_map.h b/source/glest_game/ai/annotated_map.h
index ab0f0596..e83106a8 100644
--- a/source/glest_game/ai/annotated_map.h
+++ b/source/glest_game/ai/annotated_map.h
@@ -17,6 +17,11 @@
#ifndef _GLEST_GAME_ANNOTATED_MAP_H_
#define _GLEST_GAME_ANNOTATED_MAP_H_
+#ifdef WIN32
+ #include
+ #include
+#endif
+
#include "vec.h"
#include "map.h"
diff --git a/source/glest_game/ai/cartographer.h b/source/glest_game/ai/cartographer.h
index 4351b6b8..26f32dd6 100644
--- a/source/glest_game/ai/cartographer.h
+++ b/source/glest_game/ai/cartographer.h
@@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CARTOGRAPHER_H_
#define _GLEST_GAME_CARTOGRAPHER_H_
+#ifdef WIN32
+ #include
+ #include
+#endif
+
#include "game_constants.h"
#include "influence_map.h"
#include "annotated_map.h"
diff --git a/source/glest_game/ai/cluster_map.h b/source/glest_game/ai/cluster_map.h
index 2496fa18..2ef2688c 100644
--- a/source/glest_game/ai/cluster_map.h
+++ b/source/glest_game/ai/cluster_map.h
@@ -12,6 +12,11 @@
#ifndef _GLEST_GAME_CLUSTER_MAP_H_
#define _GLEST_GAME_CLUSTER_MAP_H_
+#ifdef WIN32
+ #include
+ #include
+#endif
+
#include "util.h"
#include "game_constants.h"
#include "skill_type.h"
diff --git a/source/glest_game/ai/influence_map.h b/source/glest_game/ai/influence_map.h
index e0b6ddd3..ec96fa90 100644
--- a/source/glest_game/ai/influence_map.h
+++ b/source/glest_game/ai/influence_map.h
@@ -14,7 +14,7 @@
#define _GAME_SEARCH_INLUENCE_MAP_H_
#include "vec.h"
-#include "types.h"
+#include "data_types.h"
#include
diff --git a/source/glest_game/ai/node_pool.h b/source/glest_game/ai/node_pool.h
index 7ee92e33..900c37b0 100644
--- a/source/glest_game/ai/node_pool.h
+++ b/source/glest_game/ai/node_pool.h
@@ -15,12 +15,15 @@
#ifndef _GLEST_GAME_PATHFINDER_NODE_POOL_H_
#define _GLEST_GAME_PATHFINDER_NODE_POOL_H_
+#ifdef WIN32
+ #include
+ #include
+#endif
+
#include "vec.h"
#include "game_constants.h"
-
#include "heap.h"
-#include "types.h"
-
+#include "data_types.h"
#include
#include
#include
diff --git a/source/glest_game/ai/path_finder.h b/source/glest_game/ai/path_finder.h
index 5828d0fc..23bc4631 100644
--- a/source/glest_game/ai/path_finder.h
+++ b/source/glest_game/ai/path_finder.h
@@ -12,8 +12,12 @@
#ifndef _GLEST_GAME_PATHFINDER_H_
#define _GLEST_GAME_PATHFINDER_H_
-#include "vec.h"
+#ifdef WIN32
+ #include
+ #include
+#endif
+#include "vec.h"
#include
#include