Changeset 1610Tweet

Timestamp:

Jul 9, 2012, 11:53:18 AM (10 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:

• build/vs2010/Lol.Core.Config.props (modified) (1 diff)
• build/vs2010/Lol.Core.Vars.props (modified) (1 diff)
• build/vs2010/Lol.sln (modified) (3 diffs)
• build/vs2010/config-build.xml (moved) (moved from trunk/build/vs2010/Lol.Core.Build.props) (1 diff)
• src/lolcore.vcxproj (modified) (3 diffs)
• src/lolcore.vcxproj.filters (modified) (3 diffs)

trunk/build/vs2010/Lol.Core.Config.props

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Lol.Core.Build.props" />
+  <Import Project="config-build.xml" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

trunk/build/vs2010/Lol.Core.Vars.props

@@ -23 +23 @@
     <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
     <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
-        <Win32Defines>HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
-        <Ps3Defines>HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
-        <XboxDefines>HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
+    <Win32Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
+    <Ps3Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
+    <XboxDefines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
 
-          <!-- GTK+ & GtkGl -->
+    <!-- GTK+ & GtkGl -->
     <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
     <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>

trunk/build/vs2010/Lol.sln

@@ -77 +77 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
         ProjectSection(SolutionItems) = preProject
-                Lol.Core.Build.props = Lol.Core.Build.props
+                config-build.xml = config-build.xml
         EndProjectSection
 EndProject
@@ -260 +260 @@
                 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Build.0 = Release|Xbox 360
                 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|PS3.ActiveCfg = Debug|PS3
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|PS3.ActiveCfg = Release|PS3
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64
+                {1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.ActiveCfg = Debug|PS3
                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.Build.0 = Debug|PS3
@@ -402 +410 @@
                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+                {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
                 {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}

trunk/build/vs2010/config-build.xml

@@ -10 +10 @@
     <UseOpenGL>true</UseOpenGL>
 
+    <!-- Use Bullet for our physics solver? -->
+    <UseBullet>true</UseBullet>
+
   </PropertyGroup>
 </Project>

trunk/src/lolcore.vcxproj

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
@@ -277 +277 @@
     <ClCompile Include="platform.cpp" />
     <ClCompile Include="platform\d3d9\d3d9input.cpp" />
-    <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.cpp" />
     <ClCompile Include="platform\ps3\ps3app.cpp" />
-    <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.cpp" />
     <ClCompile Include="platform\ps3\ps3input.cpp" />
     <ClCompile Include="platform\sdl\sdlapp.cpp" />
@@ -594 +592 @@
     <ClInclude Include="platform.h" />
     <ClInclude Include="platform\d3d9\d3d9input.h" />
-    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.h" />
-    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.h" />
-    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\threadbase.h" />
+    <ClInclude Include="platform\ps3\ps3app.h" />
+    <ClInclude Include="platform\ps3\ps3input.h" />
+    <ClInclude Include="platform\ps3\threadbase.h" />
     <ClInclude Include="platform\sdl\sdlapp.h" />
     <ClInclude Include="platform\sdl\sdlinput.h" />

trunk/src/lolcore.vcxproj.filters

@@ -629 +629 @@
       <Filter>bullet</Filter>
     </ClCompile>
+    <ClCompile Include="gpu\lolfx-compiler.cpp">
+      <Filter>src\gpu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1566 +1569 @@
     <ClInclude Include="bullet\BulletMultiThreaded\vectormath2bullet.h">
       <Filter>bullet</Filter>
+    </ClInclude>
+    <ClInclude Include="gpu\lolfx-compiler.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="generated\lolfx-parser.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="platform\ps3\ps3app.h">
+      <Filter>src\platform\ps3</Filter>
+    </ClInclude>
+    <ClInclude Include="platform\ps3\ps3input.h">
+      <Filter>src\platform\ps3</Filter>
+    </ClInclude>
+    <ClInclude Include="platform\ps3\threadbase.h">
+      <Filter>src\platform\ps3</Filter>
     </ClInclude>
   </ItemGroup>
@@ -1589 +1607 @@
       <Filter>src\easymesh</Filter>
     </None>
+    <None Include="gpu\lolfx-scanner.l">
+      <Filter>src\gpu</Filter>
+    </None>
+    <None Include="gpu\lolfx-parser.y">
+      <Filter>src\gpu</Filter>
+    </None>
   </ItemGroup>
 </Project>