Changeset 1421


Ignore:
Timestamp:
May 30, 2012, 1:35:45 PM (7 years ago)
Author:
sam
Message:

build: get Orbital to build on Win32 again.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/generated/mesh-parser.cpp

    r1419 r1421  
    5454using namespace lol;
    5555
    56 #include "mesh.h"
     56#include "../mesh.h"
    5757
    5858#include <stdio.h>
     
    7272#line 61 "mesh.yy"
    7373
    74 #include "mesh-driver.h"
    75 #include "mesh-scanner.h"
     74#include "../mesh-driver.h"
     75#include "../mesh-scanner.h"
    7676
    7777#undef yylex
  • trunk/orbital/generated/mesh-scanner.cpp

    r1419 r1421  
    461461//
    462462
    463 #include "mesh-scanner.h"
     463#include "../mesh-scanner.h"
    464464
    465465typedef orbital::MeshParser::token token;
  • trunk/orbital/mesh.l

    r1419 r1421  
    66//
    77
    8 #include "mesh-scanner.h"
     8#include "../mesh-scanner.h"
    99
    1010typedef orbital::MeshParser::token token;
  • trunk/orbital/mesh.yy

    r1419 r1421  
    1515using namespace lol;
    1616
    17 #include "mesh.h"
     17#include "../mesh.h"
    1818
    1919#include <stdio.h>
     
    6060
    6161%{
    62 #include "mesh-driver.h"
    63 #include "mesh-scanner.h"
     62#include "../mesh-driver.h"
     63#include "../mesh-scanner.h"
    6464
    6565#undef yylex
  • trunk/win32/Lol.Core.Rules.props

    r1420 r1421  
    1010      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    1111      <FloatingPointModel>Fast</FloatingPointModel>
    12       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     12      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1313      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1414      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  • trunk/win32/Lol.Core.Vars.props

    r1380 r1421  
    44  <PropertyGroup Label="UserMacros">
    55    <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
     6
     7    <!-- Flex & Bison -->
     8    <FlexDir>$(ContribDir)\flex-2.5.35</FlexDir>
     9    <FlexIncludes>$(FlexDir)\include</FlexIncludes>
    610
    711    <!-- SDL -->
     
    4650  <ItemGroup>
    4751    <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
     52    <BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro>
     53    <BuildMacro Include="FlexIncludes"><Value>$(FlexIncludes)</Value></BuildMacro>
    4854    <BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro>
    4955    <BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro>
  • trunk/win32/orbital.vcxproj

    r1396 r1421  
    2929  <ItemGroup>
    3030    <ClInclude Include="..\orbital\CommandParser.h" />
     31    <ClInclude Include="..\orbital\generated\mesh-parser.h" />
    3132    <ClInclude Include="..\orbital\gun.h" />
     33    <ClInclude Include="..\orbital\mesh-driver.h" />
     34    <ClInclude Include="..\orbital\mesh-scanner.h" />
    3235    <ClInclude Include="..\orbital\mesh.h" />
    3336    <ClInclude Include="..\orbital\orbital.h" />
     
    3942  </ItemGroup>
    4043  <ItemGroup>
     44    <ClCompile Include="..\orbital\generated\mesh-parser.cpp" />
     45    <ClCompile Include="..\orbital\generated\mesh-scanner.cpp" />
     46    <ClCompile Include="..\orbital\mesh-driver.cpp" />
    4147    <ClCompile Include="..\orbital\orbital.cpp" />
    4248  </ItemGroup>
     
    4854      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    4955    </ProjectReference>
     56  </ItemGroup>
     57  <ItemGroup>
     58    <None Include="..\orbital\generated\location.hh" />
     59    <None Include="..\orbital\generated\position.hh" />
     60    <None Include="..\orbital\generated\stack.hh" />
     61    <None Include="..\orbital\mesh.l" />
     62    <None Include="..\orbital\mesh.yy" />
    5063  </ItemGroup>
    5164  <PropertyGroup Label="Globals">
  • trunk/win32/orbital.vcxproj.filters

    r1396 r1421  
    99    <ClInclude Include="..\orbital\starfield.h" />
    1010    <ClInclude Include="..\orbital\snake.h" />
     11    <ClInclude Include="..\orbital\mesh-driver.h" />
     12    <ClInclude Include="..\orbital\mesh-scanner.h" />
     13    <ClInclude Include="..\orbital\generated\mesh-parser.h">
     14      <Filter>generated</Filter>
     15    </ClInclude>
    1116  </ItemGroup>
    1217  <ItemGroup>
     
    1823  <ItemGroup>
    1924    <ClCompile Include="..\orbital\orbital.cpp" />
     25    <ClCompile Include="..\orbital\mesh-driver.cpp" />
     26    <ClCompile Include="..\orbital\generated\mesh-parser.cpp">
     27      <Filter>generated</Filter>
     28    </ClCompile>
     29    <ClCompile Include="..\orbital\generated\mesh-scanner.cpp">
     30      <Filter>generated</Filter>
     31    </ClCompile>
     32  </ItemGroup>
     33  <ItemGroup>
     34    <LolFxCompile Include="..\orbital\shiny.lolfx" />
     35  </ItemGroup>
     36  <ItemGroup>
     37    <None Include="..\orbital\mesh.l" />
     38    <None Include="..\orbital\mesh.yy" />
     39    <None Include="..\orbital\generated\location.hh">
     40      <Filter>generated</Filter>
     41    </None>
     42    <None Include="..\orbital\generated\position.hh">
     43      <Filter>generated</Filter>
     44    </None>
     45    <None Include="..\orbital\generated\stack.hh">
     46      <Filter>generated</Filter>
     47    </None>
     48  </ItemGroup>
     49  <ItemGroup>
     50    <Filter Include="generated">
     51      <UniqueIdentifier>{4fc7662b-b17a-49b9-acd1-0cf767183b06}</UniqueIdentifier>
     52    </Filter>
    2053  </ItemGroup>
    2154</Project>
Note: See TracChangeset for help on using the changeset viewer.