Don't undef main in demo - instead, link to the right libs

kallisti5 · Dec 30, 2023 · c4f9115 · c4f9115
1 parent 53f3e51
commit c4f9115
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Guisan.vcxproj b/Guisan.vcxproj
@@ -43,6 +43,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/demo/ff/Demo.vcxproj b/demo/ff/Demo.vcxproj
@@ -94,7 +94,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>Guisan.lib;SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2maind.lib;Guisan.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\$(Configuration);C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_mixer-2.0.2\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <EntryPointSymbol>
       </EntryPointSymbol>
@@ -114,7 +114,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Guisan.lib;SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2main.lib;Guisan.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\$(Configuration);C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_mixer-2.0.2\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -123,7 +123,7 @@
       <AdditionalIncludeDirectories>..\..\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Guisan.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2maind.lib;Guisan.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
     </Link>
@@ -133,7 +133,7 @@
       <AdditionalIncludeDirectories>..\..\include;.\include;C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\include;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\include;C:\Users\Gwilherm\SDL\SDL2-2.0.8\include;C:\Users\Gwilherm\SDL\SDL2_mixer-2.0.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Guisan.lib;SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2main.lib;Guisan.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\$(Configuration);C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\$(PlatformShortName);C:\Users\Gwilherm\SDL\SDL2_mixer-2.0.2\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>

diff --git a/demo/ff/src/guichanffdemo.cpp b/demo/ff/src/guichanffdemo.cpp
@@ -45,7 +45,6 @@
 #include <guisan.hpp>
 #include "ffdemo.hpp"
 
-#undef main
 int main(int argc, char** argv)
 {
     try