projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of goat:git/dosdemo
[dosdemo]
/
dosdemo.vcxproj
diff --git
a/dosdemo.vcxproj
b/dosdemo.vcxproj
index
0199594
..
f15edc4
100644
(file)
--- a/
dosdemo.vcxproj
+++ b/
dosdemo.vcxproj
@@
-51,14
+51,14
@@
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<Optimization>Disabled</Optimization>
\r
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<Optimization>Disabled</Optimization>
\r
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
- <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <PreprocessorDefinitions>WIN32;_USE_MATH_DEFINES;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;$(ProjectDir)\libs\mikmod\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
\r
</ClCompile>
\r
<Link>
\r
<SubSystem>Console</SubSystem>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
\r
</ClCompile>
\r
<Link>
\r
<SubSystem>Console</SubSystem>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
- <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
+ <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;mikmod.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
<AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
</Link>
\r
</ItemDefinitionGroup>
\r
<AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
</Link>
\r
</ItemDefinitionGroup>
\r
@@
-70,8
+70,8
@@
<Optimization>MaxSpeed</Optimization>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<IntrinsicFunctions>true</IntrinsicFunctions>
\r
<Optimization>MaxSpeed</Optimization>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<IntrinsicFunctions>true</IntrinsicFunctions>
\r
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
- <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <PreprocessorDefinitions>WIN32;_USE_MATH_DEFINES;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\sdl;$(ProjectDir)\libs\imago\src;$(ProjectDir)\libs\mikmod\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
\r
</ClCompile>
\r
<Link>
\r
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
\r
</ClCompile>
\r
<Link>
\r
@@
-79,22
+79,34
@@
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>
\r
<OptimizeReferences>true</OptimizeReferences>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>
\r
<OptimizeReferences>true</OptimizeReferences>
\r
- <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
+ <AdditionalDependencies>SDL.lib;SDLmain.lib;imago.lib;mikmod.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
<AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
</Link>
\r
</ItemDefinitionGroup>
\r
<ItemGroup>
\r
<AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
</Link>
\r
</ItemDefinitionGroup>
\r
<ItemGroup>
\r
+ <ClCompile Include="src\3dgfx.c" />
\r
+ <ClCompile Include="src\bump.c" />
\r
+ <ClCompile Include="src\cfgopt.c" />
\r
<ClCompile Include="src\demo.c" />
\r
<ClCompile Include="src\fract.c" />
\r
<ClCompile Include="src\gfxutil.c" />
\r
<ClCompile Include="src\demo.c" />
\r
<ClCompile Include="src\fract.c" />
\r
<ClCompile Include="src\gfxutil.c" />
\r
+ <ClCompile Include="src\grise.c" />
\r
+ <ClCompile Include="src\plasma.c" />
\r
+ <ClCompile Include="src\polyfill.c" />
\r
+ <ClCompile Include="src\polytest.c" />
\r
<ClCompile Include="src\screen.c" />
\r
<ClCompile Include="src\sdl\main.c" />
\r
<ClCompile Include="src\screen.c" />
\r
<ClCompile Include="src\sdl\main.c" />
\r
+ <ClCompile Include="src\sdl\music.c" />
\r
+ <ClCompile Include="src\thunder.c" />
\r
+ <ClCompile Include="src\tinyfps.c" />
\r
<ClCompile Include="src\tunnel.c" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<ClCompile Include="src\tunnel.c" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
+ <ClInclude Include="src\cfgopt.h" />
\r
<ClInclude Include="src\demo.h" />
\r
<ClInclude Include="src\gfxutil.h" />
\r
<ClInclude Include="src\screen.h" />
\r
<ClInclude Include="src\demo.h" />
\r
<ClInclude Include="src\gfxutil.h" />
\r
<ClInclude Include="src\screen.h" />
\r
+ <ClInclude Include="src\tinyfps.h" />
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
<ImportGroup Label="ExtensionTargets">
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
<ImportGroup Label="ExtensionTargets">
\r