- remove try to fix bullet compile issues
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9637 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
parent
738b687cad
commit
7a0584ba43
@ -572,8 +572,6 @@
|
|||||||
<arg value="-DCMAKE_CXX_COMPILER=g++"/>
|
<arg value="-DCMAKE_CXX_COMPILER=g++"/>
|
||||||
<arg value="-DCMAKE_RC_COMPILER=windres"/>
|
<arg value="-DCMAKE_RC_COMPILER=windres"/>
|
||||||
<arg value="-DCMAKE_FIND_ROOT_PATH=/usr"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH=/usr"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">
|
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">
|
||||||
<arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/>
|
<arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/>
|
||||||
@ -587,8 +585,6 @@
|
|||||||
<arg value="-DBUILD_EXTRAS=off"/>
|
<arg value="-DBUILD_EXTRAS=off"/>
|
||||||
<arg value="-DBUILD_DEMOS=off"/>
|
<arg value="-DBUILD_DEMOS=off"/>
|
||||||
<arg value="-DCMAKE_BUILD_TYPE=Release"/>
|
<arg value="-DCMAKE_BUILD_TYPE=Release"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<exec executable="${make.linux}" dir="${bullet.folder}"/>
|
<exec executable="${make.linux}" dir="${bullet.folder}"/>
|
||||||
<exec executable="ranlib">
|
<exec executable="ranlib">
|
||||||
@ -614,8 +610,6 @@
|
|||||||
<arg value="-DCMAKE_CXX_COMPILER=g++"/>
|
<arg value="-DCMAKE_CXX_COMPILER=g++"/>
|
||||||
<arg value="-DCMAKE_RC_COMPILER=windres"/>
|
<arg value="-DCMAKE_RC_COMPILER=windres"/>
|
||||||
<arg value="-DCMAKE_FIND_ROOT_PATH=/usr"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH=/usr"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">
|
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">
|
||||||
<arg value="-DLIBRARY_OUTPUT_PATH='${build64.folder.resolved}'"/>
|
<arg value="-DLIBRARY_OUTPUT_PATH='${build64.folder.resolved}'"/>
|
||||||
@ -626,8 +620,6 @@
|
|||||||
<arg value="-DBUILD_EXTRAS=off"/>
|
<arg value="-DBUILD_EXTRAS=off"/>
|
||||||
<arg value="-DBUILD_DEMOS=off"/>
|
<arg value="-DBUILD_DEMOS=off"/>
|
||||||
<arg value="-DCMAKE_BUILD_TYPE=Release"/>
|
<arg value="-DCMAKE_BUILD_TYPE=Release"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<exec executable="${make.linux}" dir="${bullet.folder}"/>
|
<exec executable="${make.linux}" dir="${bullet.folder}"/>
|
||||||
</target>
|
</target>
|
||||||
@ -642,8 +634,6 @@
|
|||||||
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER"/>
|
||||||
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY"/>
|
||||||
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<mkdir dir="build/bullet-base-mingw"/>
|
<mkdir dir="build/bullet-base-mingw"/>
|
||||||
<property location="build/bullet-base-mingw" name="build-mingw.folder.resolved"/>
|
<property location="build/bullet-base-mingw" name="build-mingw.folder.resolved"/>
|
||||||
@ -653,8 +643,6 @@
|
|||||||
<arg value="-DBUILD_EXTRAS=OFF"/>
|
<arg value="-DBUILD_EXTRAS=OFF"/>
|
||||||
<arg value="-DBUILD_DEMOS=OFF"/>
|
<arg value="-DBUILD_DEMOS=OFF"/>
|
||||||
<arg value="-DLIBRARY_OUTPUT_PATH='${build-mingw.folder.resolved}'"/>
|
<arg value="-DLIBRARY_OUTPUT_PATH='${build-mingw.folder.resolved}'"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<exec executable="${make.linux}" dir="${bullet.folder}"/>
|
<exec executable="${make.linux}" dir="${bullet.folder}"/>
|
||||||
<exec executable="${cross.compile.target}-ranlib">
|
<exec executable="${cross.compile.target}-ranlib">
|
||||||
@ -681,8 +669,6 @@
|
|||||||
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER"/>
|
||||||
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY"/>
|
||||||
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"/>
|
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"/>
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=''"/>
|
|
||||||
<arg value="-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=''"/>
|
|
||||||
</exec>
|
</exec>
|
||||||
<mkdir dir="build/bullet-base-mingw-64"/>
|
<mkdir dir="build/bullet-base-mingw-64"/>
|
||||||
<property location="build/bullet-base-mingw-64" name="build-mingw64.folder.resolved"/>
|
<property location="build/bullet-base-mingw-64" name="build-mingw64.folder.resolved"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user