Changeset 1566
- Timestamp:
- Jul 3, 2012, 3:43:19 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 40 added
- 3 edited
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/build/vs2010/Lol.Core.Rules.props
r1554 r1566 10 10 <MultiProcessorCompilation>true</MultiProcessorCompilation> 11 11 <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> 15 15 <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 16 16 <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> … … 37 37 <GenerateDebugInformation>true</GenerateDebugInformation> 38 38 <!-- 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> 40 40 <AdditionalDependencies Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies> 41 41 <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> 43 44 <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 44 45 <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 46 <AdditionalLibraryDirectories>$(BtPhysLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 45 47 <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> 46 48 <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 22 22 <!-- BulletPhysics --> 23 23 <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> 28 32 29 33 <!-- GTK+ & GtkGl --> -
trunk/contrib/NOTES
r1464 r1566 78 78 resulting .lib files and some headers. 79 79 80 81 Bullet 82 ------ 83 84 Download page: http://code.google.com/p/bullet/downloads/list 85 86 Win32: 87 - build normally using Visual Studio 2010 88 89 Win64: 90 - build normally using Visual Studio 2010 91 - remove _x64 suffix from object names 92 93 Xbox 360: 94 - add Xbox 360 platform to the vs2010 solution, using eg. Win32 as a preset 95 - save solution and exit vs2010 96 - sed -i 's@<ItemDefinitionGroup.*Xbox 360.*@&<ClCompile><PreprocessorDefinitions>_XBOX;%(PreprocessorDefinitions)</PreprocessorDefinitions></ClCompile>@' msvc/vs2010/*.vcxproj 97 - sed -i 's@.*MachineX86.*@@' msvc/vs2010/*vcxproj 98 - reload solution 99 - build only required projects 100 101 PS3: 102 - sh autogen.sh 103 - ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=powerpc 104 - make -j4 105 - make install DESTDIR=$PWD/tmp 106
Note: See TracChangeset
for help on using the changeset viewer.