Changeset 1610


Ignore:
Timestamp:
Jul 9, 2012, 11:53:18 AM (7 years ago)
Author:
sam
Message:

build: rename "Lol.Core.Build.props" to the more explicit "config-build.xml"
and add a new "UseBullet" configuration flag.

Location:
trunk
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.Core.Config.props

    r1538 r1610  
    11<?xml version="1.0" encoding="utf-8"?>
    22<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    3   <Import Project="Lol.Core.Build.props" />
     3  <Import Project="config-build.xml" />
    44  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    55  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1609 r1610  
    2323    <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
    2424    <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
    25         <Win32Defines>HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
    26         <Ps3Defines>HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
    27         <XboxDefines>HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
     25    <Win32Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
     26    <Ps3Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
     27    <XboxDefines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
    2828
    29           <!-- GTK+ & GtkGl -->
     29    <!-- GTK+ & GtkGl -->
    3030    <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
    3131    <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
  • trunk/build/vs2010/Lol.sln

    r1598 r1610  
    7777Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
    7878        ProjectSection(SolutionItems) = preProject
    79                 Lol.Core.Build.props = Lol.Core.Build.props
     79                config-build.xml = config-build.xml
    8080        EndProjectSection
    8181EndProject
     
    260260                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Build.0 = Release|Xbox 360
    261261                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     262                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|PS3.ActiveCfg = Debug|PS3
     263                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32
     264                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64
     265                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
     266                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|PS3.ActiveCfg = Release|PS3
     267                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32
     268                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64
     269                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
    262270                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.ActiveCfg = Debug|PS3
    263271                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.Build.0 = Debug|PS3
     
    402410                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    403411                {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
     412                {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    404413                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
    405414                {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}
  • trunk/build/vs2010/config-build.xml

    r1609 r1610  
    1010    <UseOpenGL>true</UseOpenGL>
    1111
     12    <!-- Use Bullet for our physics solver? -->
     13    <UseBullet>true</UseBullet>
     14
    1215  </PropertyGroup>
    1316</Project>
  • trunk/src/lolcore.vcxproj

    r1590 r1610  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     
    277277    <ClCompile Include="platform.cpp" />
    278278    <ClCompile Include="platform\d3d9\d3d9input.cpp" />
    279     <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.cpp" />
    280279    <ClCompile Include="platform\ps3\ps3app.cpp" />
    281     <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.cpp" />
    282280    <ClCompile Include="platform\ps3\ps3input.cpp" />
    283281    <ClCompile Include="platform\sdl\sdlapp.cpp" />
     
    594592    <ClInclude Include="platform.h" />
    595593    <ClInclude Include="platform\d3d9\d3d9input.h" />
    596     <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.h" />
    597     <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.h" />
    598     <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\threadbase.h" />
     594    <ClInclude Include="platform\ps3\ps3app.h" />
     595    <ClInclude Include="platform\ps3\ps3input.h" />
     596    <ClInclude Include="platform\ps3\threadbase.h" />
    599597    <ClInclude Include="platform\sdl\sdlapp.h" />
    600598    <ClInclude Include="platform\sdl\sdlinput.h" />
  • trunk/src/lolcore.vcxproj.filters

    r1590 r1610  
    629629      <Filter>bullet</Filter>
    630630    </ClCompile>
     631    <ClCompile Include="gpu\lolfx-compiler.cpp">
     632      <Filter>src\gpu</Filter>
     633    </ClCompile>
    631634  </ItemGroup>
    632635  <ItemGroup>
     
    15661569    <ClInclude Include="bullet\BulletMultiThreaded\vectormath2bullet.h">
    15671570      <Filter>bullet</Filter>
     1571    </ClInclude>
     1572    <ClInclude Include="gpu\lolfx-compiler.h">
     1573      <Filter>src\gpu</Filter>
     1574    </ClInclude>
     1575    <ClInclude Include="generated\lolfx-parser.h">
     1576      <Filter>src\gpu</Filter>
     1577    </ClInclude>
     1578    <ClInclude Include="platform\ps3\ps3app.h">
     1579      <Filter>src\platform\ps3</Filter>
     1580    </ClInclude>
     1581    <ClInclude Include="platform\ps3\ps3input.h">
     1582      <Filter>src\platform\ps3</Filter>
     1583    </ClInclude>
     1584    <ClInclude Include="platform\ps3\threadbase.h">
     1585      <Filter>src\platform\ps3</Filter>
    15681586    </ClInclude>
    15691587  </ItemGroup>
     
    15891607      <Filter>src\easymesh</Filter>
    15901608    </None>
     1609    <None Include="gpu\lolfx-scanner.l">
     1610      <Filter>src\gpu</Filter>
     1611    </None>
     1612    <None Include="gpu\lolfx-parser.y">
     1613      <Filter>src\gpu</Filter>
     1614    </None>
    15911615  </ItemGroup>
    15921616</Project>
Note: See TracChangeset for help on using the changeset viewer.