Fixed VS project and .gitignore

diff --git a/.gitignore b/.gitignore
index e42bc47708caae779d25f5e0330048d81c2e46dc..b9f8674f2775fcff00b4257dc96a125522d486f5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
 *.o
 *.obj
-*.DS_Store
\ No newline at end of file
+*.DS_Store
+*.log
+*.user
+.vs/
+Debug/
+Release/
\ No newline at end of file

diff --git a/doomgeneric/doomgeneric.vcxproj b/doomgeneric/doomgeneric.vcxproj
index 20c32c19603fed2dc820be9308200ca3a515e245..48684f9cce2951a8b19c7976980ba6dc87988684 100644 (file)
--- a/doomgeneric/doomgeneric.vcxproj
+++ b/doomgeneric/doomgeneric.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{95A126D2-CC94-4840-BF05-80305041B5FB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>doomgeneric</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -90,6 +90,7 @@
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <DisableSpecificWarnings>4146;4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -98,12 +99,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <DisableSpecificWarnings>4146;4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -120,6 +122,7 @@
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <DisableSpecificWarnings>4146;4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -130,7 +133,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -138,6 +141,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <DisableSpecificWarnings>4146;4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -173,7 +177,6 @@
     <ClCompile Include="i_endoom.c" />
     <ClCompile Include="i_input.c" />
     <ClCompile Include="i_joystick.c" />
-    <ClCompile Include="i_main.c" />
     <ClCompile Include="i_scale.c" />
     <ClCompile Include="i_sound.c" />
     <ClCompile Include="i_system.c" />

diff --git a/doomgeneric/doomgeneric.vcxproj.filters b/doomgeneric/doomgeneric.vcxproj.filters
index 5c65ee495b2aadc2aebf5dc17829fb18396e57e3..749df13440e2b66cfbe86439418303e816ac19cb 100644 (file)
--- a/doomgeneric/doomgeneric.vcxproj.filters
+++ b/doomgeneric/doomgeneric.vcxproj.filters
@@ -78,9 +78,6 @@
     <ClCompile Include="i_joystick.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="i_main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="i_scale.c">
       <Filter>Source Files</Filter>
     </ClCompile>