hide log window in release mode

skilion · Nov 6, 2014 · 370c651 · 370c651
1 parent 636ae16
commit 370c651
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 75 deletions.
diff --git a/Source/Engine/Engine.cpp b/Source/Engine/Engine.cpp
@@ -40,7 +40,11 @@ Game		*myengine::game		= nullptr;
 bool Engine::initialize()
 {
 	system		= System::create();
+#ifdef DEBUG
 	log			= Log::create();
+#else
+	log = new Log();
+#endif
 	render		= Render::create();
 	audio		= Audio::create();
 	//guiStyle	= new Gui;

diff --git a/Source/Engine/Engine.vcxproj b/Source/Engine/Engine.vcxproj
@@ -43,9 +43,6 @@
     </ClCompile>
     <ClCompile Include="Log\WindowsLog.cpp" />
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="Network\ClientSocket.cpp" />
-    <ClCompile Include="Network\Http.cpp" />
-    <ClCompile Include="Network\WindowsClientSocket.cpp" />
     <ClCompile Include="Render\Camera.cpp" />
     <ClCompile Include="Render\Color.cpp" />
     <ClCompile Include="Render\Font.cpp" />
@@ -67,12 +64,6 @@
     </ClCompile>
     <ClCompile Include="System\WindowsSystem.cpp" />
     <ClCompile Include="System\WindowsWndProc.cpp" />
-    <ClCompile Include="Thread\LinuxThread.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Thread\Thread.cpp" />
-    <ClCompile Include="Thread\WindowsThread.cpp" />
     <ClCompile Include="World\WorldNode.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -103,10 +94,6 @@
     <ClInclude Include="Log.h" />
     <ClInclude Include="Log\StandardLog.h" />
     <ClInclude Include="Log\WindowsLog.h" />
-    <ClInclude Include="Network\Http.h" />
-    <ClInclude Include="Network\ListenSocket.h" />
-    <ClInclude Include="Network\ClientSocket.h" />
-    <ClInclude Include="Network\WindowsClientSocket.h" />
     <ClInclude Include="Render\Camera.h" />
     <ClInclude Include="Render\Color.h" />
     <ClInclude Include="Render\Font.h" />
@@ -124,9 +111,6 @@
     <ClInclude Include="System\WindowsHeader.h" />
     <ClInclude Include="System\WindowsSystem.h" />
     <ClInclude Include="System\WindowsWndProc.h" />
-    <ClInclude Include="Thread\LinuxThread.h" />
-    <ClInclude Include="Thread\Thread.h" />
-    <ClInclude Include="Thread\WindowsThread.h" />
     <ClInclude Include="World\WorldNode.h" />
   </ItemGroup>
   <ItemGroup>
@@ -187,7 +171,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\;$(SolutionDir)\Framework\;$(SolutionDir)\..\External\freetype2\include;$(SolutionDir)\..\External\libjpeg\;$(SolutionDir)\..\External\libogg\include\;$(SolutionDir)\..\External\libpng\;$(SolutionDir)\..\External\libvorbis\include\;$(SolutionDir)\..\External\OpenAL;$(SolutionDir)\..\External\OpenGL;$(SolutionDir)\..\External\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)Framework\;$(SolutionDir)..\External\freetype2\include;$(SolutionDir)..\External\libjpeg\;$(SolutionDir)..\External\libogg\include\;$(SolutionDir)..\External\libpng\;$(SolutionDir)..\External\libvorbis\include\;$(SolutionDir)..\External\OpenAL;$(SolutionDir)..\External\OpenGL;$(SolutionDir)..\External\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Sync</ExceptionHandling>
       <EnablePREfast>false</EnablePREfast>
       <OmitFramePointers>false</OmitFramePointers>
@@ -218,15 +202,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\;$(SolutionDir)\Framework\;$(SolutionDir)\..\External\freetype2\include;$(SolutionDir)\..\External\libjpeg\;$(SolutionDir)\..\External\libogg\include\;$(SolutionDir)\..\External\libpng\;$(SolutionDir)\..\External\libvorbis\include\;$(SolutionDir)\..\External\OpenAL;$(SolutionDir)\..\External\OpenGL;$(SolutionDir)\..\External\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)Framework\;$(SolutionDir)..\External\freetype2\include;$(SolutionDir)..\External\libjpeg\;$(SolutionDir)..\External\libogg\include\;$(SolutionDir)..\External\libpng\;$(SolutionDir)..\External\libvorbis\include\;$(SolutionDir)..\External\OpenAL;$(SolutionDir)..\External\OpenGL;$(SolutionDir)..\External\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <ExceptionHandling>false</ExceptionHandling>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
       <StructMemberAlignment>4Bytes</StructMemberAlignment>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ProgramDataBaseFileName>$(OutDir)\$(ProjectName).pdb</ProgramDataBaseFileName>
       <WholeProgramOptimization>true</WholeProgramOptimization>

diff --git a/Source/Engine/Engine.vcxproj.filters b/Source/Engine/Engine.vcxproj.filters
@@ -33,12 +33,6 @@
     <Filter Include="Source files\EventSystem">
       <UniqueIdentifier>{d747a3f3-7455-445d-889d-368a977e13dc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header files\Thread">
-      <UniqueIdentifier>{0098e478-ff76-413e-908d-6f98fe1b9641}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\Thread">
-      <UniqueIdentifier>{cc442764-c9e9-421b-b91b-29e8da89e823}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header files\Log">
       <UniqueIdentifier>{beed67e9-368b-4dfc-90f9-73fbdcb50090}</UniqueIdentifier>
     </Filter>
@@ -57,12 +51,6 @@
     <Filter Include="Source files\Audio">
       <UniqueIdentifier>{4feca4cf-7594-47ed-9376-73349dad7b9c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header files\Network">
-      <UniqueIdentifier>{dfb2169b-2b57-4587-9840-aff1de846a5b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\Network">
-      <UniqueIdentifier>{263f82e7-7dde-4e9a-b8a0-efdf88b10d6a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header files\Gui">
       <UniqueIdentifier>{ca97a6a0-98d1-455a-ab65-cd29fa4a3b91}</UniqueIdentifier>
     </Filter>
@@ -125,15 +113,6 @@
     <ClCompile Include="EventSystem\MouseEvent.cpp">
       <Filter>Source files\EventSystem</Filter>
     </ClCompile>
-    <ClCompile Include="Thread\LinuxThread.cpp">
-      <Filter>Source files\Thread</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread\Thread.cpp">
-      <Filter>Source files\Thread</Filter>
-    </ClCompile>
-    <ClCompile Include="Thread\WindowsThread.cpp">
-      <Filter>Source files\Thread</Filter>
-    </ClCompile>
     <ClCompile Include="Log\WindowsLog.cpp">
       <Filter>Source files\Log</Filter>
     </ClCompile>
@@ -173,15 +152,6 @@
     <ClCompile Include="Audio\WaveAudioStream.cpp">
       <Filter>Source files\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="Network\ClientSocket.cpp">
-      <Filter>Source files\Network</Filter>
-    </ClCompile>
-    <ClCompile Include="Network\WindowsClientSocket.cpp">
-      <Filter>Source files\Network</Filter>
-    </ClCompile>
-    <ClCompile Include="Network\Http.cpp">
-      <Filter>Source files\Network</Filter>
-    </ClCompile>
     <ClCompile Include="Audio.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
@@ -280,15 +250,6 @@
     <ClInclude Include="EventSystem\MouseEvent.h">
       <Filter>Header files\EventSystem</Filter>
     </ClInclude>
-    <ClInclude Include="Thread\LinuxThread.h">
-      <Filter>Header files\Thread</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread\Thread.h">
-      <Filter>Header files\Thread</Filter>
-    </ClInclude>
-    <ClInclude Include="Thread\WindowsThread.h">
-      <Filter>Header files\Thread</Filter>
-    </ClInclude>
     <ClInclude Include="Log\WindowsLog.h">
       <Filter>Header files\Log</Filter>
     </ClInclude>
@@ -334,18 +295,6 @@
     <ClInclude Include="EventSystem\Sender.h">
       <Filter>Header files\EventSystem</Filter>
     </ClInclude>
-    <ClInclude Include="Network\ListenSocket.h">
-      <Filter>Header files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="Network\ClientSocket.h">
-      <Filter>Header files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="Network\WindowsClientSocket.h">
-      <Filter>Header files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="Network\Http.h">
-      <Filter>Header files\Network</Filter>
-    </ClInclude>
     <ClInclude Include="Render\FreetypeFont.h">
       <Filter>Header files\Render</Filter>
     </ClInclude>

diff --git a/Source/Engine/Log.cpp b/Source/Engine/Log.cpp
@@ -3,10 +3,7 @@
 #include <cstdarg>
 
 #include "Log.h"
-
-//#include "global.h"
 #include "myString.h"
-
 #include "memdbg.h"
 
 using namespace myengine;

diff --git a/Source/Engine/Log.h b/Source/Engine/Log.h
@@ -25,7 +25,7 @@ namespace myengine {
 
 		static Log		*create();
 
-		virtual void	print(const char *string) = 0;
+		virtual void	print(const char *string);
 		void			printf(const char *format, ...);
 
 

diff --git a/Source/Jump&Run/Jump&Run.vcxproj b/Source/Jump&Run/Jump&Run.vcxproj
@@ -63,7 +63,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">