Update VS solution files, fix main.hpp

vi3itor · Jul 31, 2020 · 336cf43 · 336cf43
1 parent 9ca6f06
commit 336cf43
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 207 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 cmake-build*/
 .idea/
 .vs/
-libs/
 Release/
 Debug/
+data/log.txt
+GameplayFootball.vcxproj.user
diff --git a/GameplayFootball.sln b/GameplayFootball.sln
@@ -13,12 +13,10 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Debug|x64.ActiveCfg = Debug|x64
-		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Debug|x64.Build.0 = Debug|x64
+		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Debug|x64.ActiveCfg = Debug|Win32
 		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Debug|x86.ActiveCfg = Debug|Win32
 		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Debug|x86.Build.0 = Debug|Win32
-		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Release|x64.ActiveCfg = Release|x64
-		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Release|x64.Build.0 = Release|x64
+		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Release|x64.ActiveCfg = Release|Win32
 		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Release|x86.ActiveCfg = Release|Win32
 		{A5F66243-D9BA-4B43-97F4-EE95F4215F56}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection

diff --git a/GameplayFootball.vcxproj b/GameplayFootball.vcxproj
@@ -393,9 +393,6 @@
     <ClInclude Include="src\utils\threadhud.hpp" />
     <ClInclude Include="src\utils\xmlloader.hpp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="src\libs\sqlite3\sqlite3.def" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -450,9 +447,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(Configuration)\Intermediate</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(Configuration)\Intermediate</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -466,18 +465,21 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SHAREDLIBS_ROOT)/boost_1_72_0;$(SolutionDir)libs\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src</AdditionalIncludeDirectories>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <DisableSpecificWarnings>
-      </DisableSpecificWarnings>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <ObjectFileName>$(IntDir)%(RelativeDir)/</ObjectFileName>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)libs\lib;$(SHAREDLIBS_ROOT)/boost_1_72_0/stage/lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>SDL2.lib;SDL2_gfx.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2main.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>manual-link\SDL2maind.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <NoEntryPoint>false</NoEntryPoint>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -489,18 +491,18 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SHAREDLIBS_ROOT)/boost_1_72_0;$(SolutionDir)libs\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;</AdditionalIncludeDirectories>
       <ObjectFileName>$(IntDir)%(RelativeDir)/</ObjectFileName>
-      <DisableSpecificWarnings>
-      </DisableSpecificWarnings>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)libs\lib;$(SHAREDLIBS_ROOT)/boost_1_72_0/stage/lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>SDL2.lib;SDL2_gfx.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2main.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>manual-link\SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

diff --git a/src/libs/sqlite3/sqlite3.def b/src/libs/sqlite3/sqlite3.def
diff --git a/src/main.cpp b/src/main.cpp
@@ -36,6 +36,7 @@
 
 #include "SDL2/SDL_ttf.h"
 
+// VK: TODO Update sqlite3
 #include "libs/sqlite3/sqlite3.h"
 
 #if defined(WIN32) && defined(__MINGW32__)

diff --git a/src/main.hpp b/src/main.hpp
@@ -68,6 +68,9 @@ int PredictFrameTimeToGo_ms(int frameCount);
 
 const std::vector<IHIDevice*> &GetControllers();
 
+// VK: TODO Process MinGW correctly (see main.cpp for hints)
+#ifndef WIN32
 int main(int argc, char** argv);
+#endif
 
 #endif