Changeset 1566 for trunk/build


Ignore:
Timestamp:
Jul 3, 2012, 3:43:19 PM (8 years ago)
Author:
sam
Message:

build: ship BulletPhysics for Win32, Win64, X360 and PS3.

Location:
trunk/build/vs2010
Files:
2 edited

Legend:

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

    r1554 r1566  
    1010      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    1111      <FloatingPointModel>Fast</FloatingPointModel>
    12       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    13       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(BtPhysIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    14       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(BtPhysIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     12      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     13      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     14      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1515      <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1616      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     
    3737      <GenerateDebugInformation>true</GenerateDebugInformation>
    3838      <!-- FIXME: not for the static library! -->
    39       <AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(BtPhysDeps);$(GdiDeps);%(AdditionalDependencies)</AdditionalDependencies>
     39      <AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);%(AdditionalDependencies)</AdditionalDependencies>
    4040      <AdditionalDependencies Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
    4141      <AdditionalDependencies Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies>
    42       <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);$(BtPhysLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     42      <AdditionalDependencies>$(BtPhysDeps);%(AdditionalDependencies)</AdditionalDependencies>
     43      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    4344      <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    4445      <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     46      <AdditionalLibraryDirectories>$(BtPhysLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    4547      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
    4648      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1558 r1566  
    2222    <!-- BulletPhysics -->
    2323    <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
    24     <BtPhysIncludes>$(BtPhysDir)\include</BtPhysIncludes>
    25     <BtPhysLibs Condition="'$(Platform)'=='Win32'">$(BtPhysDir)\lib\i686-w64-mingw32</BtPhysLibs>
    26     <BtPhysDeps Condition="'$(Platform)'=='Win32'">BulletCollision.lib;BulletDynamics.lib;BulletSoftBody.lib;LinearMath.lib</BtPhysDeps>
    27     <Win32Defines>$(Win32Defines)</Win32Defines>
     24    <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
     25    <BtPhysLibs Condition="'$(Platform)'=='Win32'">$(BtPhysDir)\lib\i686-w64-msvc</BtPhysLibs>
     26    <BtPhysLibs Condition="'$(Platform)'=='x64'">$(BtPhysDir)\lib\x86_64-w64-msvc</BtPhysLibs>
     27    <BtPhysLibs Condition="'$(Platform)'=='Xbox 360'">$(BtPhysDir)\lib\xenon-x360-msvc</BtPhysLibs>
     28    <BtPhysLibs Condition="'$(Platform)'=='PS3'">$(BtPhysDir)\lib\ps3-lv2-gcc</BtPhysLibs>
     29    <BtPhysDeps Condition="'$(Configuration)'=='Release' And '$(Platform)'!='PS3'">BulletCollision.lib;BulletDynamics.lib;BulletSoftBody.lib;LinearMath.lib</BtPhysDeps>
     30    <BtPhysDeps Condition="'$(Configuration)'=='Debug' And '$(Platform)'!='PS3'">BulletCollision_debug.lib;BulletDynamics_debug.lib;BulletSoftBody_debug.lib;LinearMath_debug.lib</BtPhysDeps>
     31    <BtPhysDeps Condition="'$(Platform)'=='PS3'">libBulletCollision.a;libBulletDynamics.a;libBulletSoftBody.a;libLinearMath.a</BtPhysDeps>
    2832
    2933    <!-- GTK+ & GtkGl -->
Note: See TracChangeset for help on using the changeset viewer.