From 512ce5529c595efdfaf99c7c437e54163a01bada Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 30 May 2012 11:35:45 +0000
Subject: [PATCH] build: get Orbital to build on Win32 again.

---
 win32/Lol.Core.Rules.props    |  2 +-
 win32/Lol.Core.Vars.props     |  6 ++++++
 win32/orbital.vcxproj         | 15 ++++++++++++++-
 win32/orbital.vcxproj.filters | 35 ++++++++++++++++++++++++++++++++++-
 4 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/win32/Lol.Core.Rules.props b/win32/Lol.Core.Rules.props
index 36aac665..52ca340a 100644
--- a/win32/Lol.Core.Rules.props
+++ b/win32/Lol.Core.Rules.props
@@ -9,7 +9,7 @@
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/win32/Lol.Core.Vars.props b/win32/Lol.Core.Vars.props
index 542184cf..d609ce99 100644
--- a/win32/Lol.Core.Vars.props
+++ b/win32/Lol.Core.Vars.props
@@ -4,6 +4,10 @@
   <PropertyGroup Label="UserMacros">
     <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
 
+    <!-- Flex & Bison -->
+    <FlexDir>$(ContribDir)\flex-2.5.35</FlexDir>
+    <FlexIncludes>$(FlexDir)\include</FlexIncludes>
+
     <!-- SDL -->
     <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
     <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
@@ -45,6 +49,8 @@
   <ItemDefinitionGroup />
   <ItemGroup>
     <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
+    <BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro>
+    <BuildMacro Include="FlexIncludes"><Value>$(FlexIncludes)</Value></BuildMacro>
     <BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro>
     <BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro>
     <BuildMacro Include="SdlMixerDir"><Value>$(SdlMixerDir)</Value></BuildMacro>
diff --git a/win32/orbital.vcxproj b/win32/orbital.vcxproj
index 6056a831..ed92da21 100644
--- a/win32/orbital.vcxproj
+++ b/win32/orbital.vcxproj
@@ -28,7 +28,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\orbital\CommandParser.h" />
+    <ClInclude Include="..\orbital\generated\mesh-parser.h" />
     <ClInclude Include="..\orbital\gun.h" />
+    <ClInclude Include="..\orbital\mesh-driver.h" />
+    <ClInclude Include="..\orbital\mesh-scanner.h" />
     <ClInclude Include="..\orbital\mesh.h" />
     <ClInclude Include="..\orbital\orbital.h" />
     <ClInclude Include="..\orbital\particlesystem.h" />
@@ -38,6 +41,9 @@
     <ClInclude Include="..\orbital\tank.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\orbital\generated\mesh-parser.cpp" />
+    <ClCompile Include="..\orbital\generated\mesh-scanner.cpp" />
+    <ClCompile Include="..\orbital\mesh-driver.cpp" />
     <ClCompile Include="..\orbital\orbital.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -48,6 +54,13 @@
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\orbital\generated\location.hh" />
+    <None Include="..\orbital\generated\position.hh" />
+    <None Include="..\orbital\generated\stack.hh" />
+    <None Include="..\orbital\mesh.l" />
+    <None Include="..\orbital\mesh.yy" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{ee203b88-44cf-4859-9d42-7a5f40fecb52}</ProjectGuid>
     <ConfigurationType>Application</ConfigurationType>
@@ -68,4 +81,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="Lol.Fx.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32/orbital.vcxproj.filters b/win32/orbital.vcxproj.filters
index 48cbfbb5..2f0f8918 100644
--- a/win32/orbital.vcxproj.filters
+++ b/win32/orbital.vcxproj.filters
@@ -8,6 +8,11 @@
     <ClInclude Include="..\orbital\tank.h" />
     <ClInclude Include="..\orbital\starfield.h" />
     <ClInclude Include="..\orbital\snake.h" />
+    <ClInclude Include="..\orbital\mesh-driver.h" />
+    <ClInclude Include="..\orbital\mesh-scanner.h" />
+    <ClInclude Include="..\orbital\generated\mesh-parser.h">
+      <Filter>generated</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\orbital\orbital.h" />
@@ -17,5 +22,33 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\orbital\orbital.cpp" />
+    <ClCompile Include="..\orbital\mesh-driver.cpp" />
+    <ClCompile Include="..\orbital\generated\mesh-parser.cpp">
+      <Filter>generated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\orbital\generated\mesh-scanner.cpp">
+      <Filter>generated</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <LolFxCompile Include="..\orbital\shiny.lolfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\orbital\mesh.l" />
+    <None Include="..\orbital\mesh.yy" />
+    <None Include="..\orbital\generated\location.hh">
+      <Filter>generated</Filter>
+    </None>
+    <None Include="..\orbital\generated\position.hh">
+      <Filter>generated</Filter>
+    </None>
+    <None Include="..\orbital\generated\stack.hh">
+      <Filter>generated</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="generated">
+      <UniqueIdentifier>{4fc7662b-b17a-49b9-acd1-0cf767183b06}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file