Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes to the MSVC build system

master
vexed 2011-11-08 21:41:58 -05:00
parent e2f6e7f3c1
commit 41515b089b
8 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/framework/framework.vcxproj
View File

@ -77,11 +77,11 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<Optimization>Disabled</Optimization>
@ -134,7 +134,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -153,7 +153,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Release|Win32'">
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -223,12 +223,12 @@
<ClInclude Include="opengl.h" />
<ClInclude Include="physfs_ext.h" />
<ClInclude Include="resly.h" />
<ClInclude Include="resource_parser.tab.hpp" />
<ClInclude Include="resource_parser.hpp" />
<ClInclude Include="stdio_ext.h" />
<ClInclude Include="string_ext.h" />
<ClInclude Include="strres.h" />
<ClInclude Include="strresly.h" />
<ClInclude Include="strres_parser.tab.hpp" />
<ClInclude Include="strres_parser.hpp" />
<ClInclude Include="treap.h" />
<ClInclude Include="trig.h" />
<ClInclude Include="types.h" />

12
lib/framework/framework.vcxproj.filters
View File

@ -121,9 +121,6 @@
<ClInclude Include="resly.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource_parser.tab.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="stdio_ext.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -133,9 +130,6 @@
<ClInclude Include="strres.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="strres_parser.tab.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="strresly.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -169,6 +163,12 @@
<ClInclude Include="wzglobal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="strres_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="resource_lexer.lpp">

12
lib/gamelib/gamelib.vcxproj
View File

@ -77,11 +77,11 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<Optimization>Disabled</Optimization>
@ -124,7 +124,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -139,7 +139,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Release|Win32'">
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -163,7 +163,7 @@
<ItemGroup>
<ClInclude Include="anim.h" />
<ClInclude Include="animobj.h" />
<ClInclude Include="audp_parser.tab.hpp" />
<ClInclude Include="audp_parser.hpp" />
<ClInclude Include="gtime.h" />
<ClInclude Include="hashtable.h" />
<ClInclude Include="parser.h" />
@ -171,6 +171,8 @@
<ItemGroup>
<FlexGenerator Include="audp_lexer.lpp">
<FileType>Document</FileType>
<ScannerPrefix Condition="'$(Configuration)|$(Platform)'=='STLport-Debug|Win32'">
</ScannerPrefix>
</FlexGenerator>
<BisonParser Include="audp_parser.ypp">
<FileType>Document</FileType>

2
lib/gamelib/gamelib.vcxproj.filters
View File

@ -40,7 +40,7 @@
<ClInclude Include="animobj.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="audp_parser.tab.hpp">
<ClInclude Include="audp_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="gtime.h">

12
lib/script/script.vcxproj
View File

@ -77,11 +77,11 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<Optimization>Disabled</Optimization>
@ -124,7 +124,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -139,7 +139,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='STLport-Release|Win32'">
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -165,7 +165,7 @@
<ClCompile Include="stack.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="chat_parser.tab.hpp" />
<ClInclude Include="chat_parser.hpp" />
<ClInclude Include="chat_processing.h" />
<ClInclude Include="codeprint.h" />
<ClInclude Include="event.h" />
@ -173,7 +173,7 @@
<ClInclude Include="interpreter.h" />
<ClInclude Include="parse.h" />
<ClInclude Include="script.h" />
<ClInclude Include="script_parser.tab.hpp" />
<ClInclude Include="script_parser.hpp" />
<ClInclude Include="stack.h" />
</ItemGroup>
<ItemGroup>

10
lib/script/script.vcxproj.filters
View File

@ -46,9 +46,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="chat_parser.tab.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="chat_processing.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -70,10 +67,13 @@
<ClInclude Include="script.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="script_parser.tab.hpp">
<ClInclude Include="stack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="stack.h">
<ClInclude Include="chat_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="script_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

16
src/Warzone2100.vcxproj
View File

@ -106,11 +106,11 @@
<BisonParser>
<Defines>true</Defines>
<NoGenLineDirectives>false</NoGenLineDirectives>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
<RenameExternalSymbols>%(Filename)</RenameExternalSymbols>
</BisonParser>
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
<TraceMode>false</TraceMode>
<ScannerPrefix>%(Filename)</ScannerPrefix>
</FlexGenerator>
@ -207,10 +207,10 @@
</PreBuildEvent>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\lib\sqlite3;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -243,10 +243,10 @@
</PreBuildEvent>
<BisonParser>
<Defines>true</Defines>
<OutputFile>%(Filename).tab.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</BisonParser>
<FlexGenerator>
<OutputFile>%(Filename).lex.cpp</OutputFile>
<OutputFile>%(Filename).cpp</OutputFile>
</FlexGenerator>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\lib\sqlite3;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -456,7 +456,7 @@
<ClInclude Include="mapgrid.h" />
<ClInclude Include="mechanics.h" />
<ClInclude Include="message.h" />
<ClInclude Include="message_parser.tab.hpp" />
<ClInclude Include="message_parser.hpp" />
<ClInclude Include="messagedef.h" />
<ClInclude Include="messagely.h" />
<ClInclude Include="miscimd.h" />
@ -499,7 +499,7 @@
<ClInclude Include="scriptobj.h" />
<ClInclude Include="scripttabs.h" />
<ClInclude Include="scriptvals.h" />
<ClInclude Include="scriptvals_parser.tab.hpp" />
<ClInclude Include="scriptvals_parser.hpp" />
<ClInclude Include="selection.h" />
<ClInclude Include="seqdisp.h" />
<ClInclude Include="stats.h" />

12
src/Warzone2100.vcxproj.filters
View File

@ -554,9 +554,6 @@
<ClInclude Include="message.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="message_parser.tab.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="messagedef.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -677,9 +674,6 @@
<ClInclude Include="scriptvals.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="scriptvals_parser.tab.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="selection.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -737,6 +731,12 @@
<ClInclude Include="qtscriptfuncs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="message_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="scriptvals_parser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\win32\warzone2100.rc">