From a26082cabad2d50e0720d29311eb28857bf531d4 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sun, 4 Dec 2011 07:04:51 +0000 Subject: [PATCH] engine project: - add native bullet c++ files to project view - add configuration to build and run bullet git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8857 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/nbproject/build-impl.xml | 19 ++++++++++++++----- .../configs/Native_Bullet.properties | 3 +++ engine/nbproject/genfiles.properties | 4 ++-- engine/nbproject/project.properties | 1 + engine/nbproject/project.xml | 1 + 5 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 engine/nbproject/configs/Native_Bullet.properties diff --git a/engine/nbproject/build-impl.xml b/engine/nbproject/build-impl.xml index 58b86470a..b97ff9d66 100644 --- a/engine/nbproject/build-impl.xml +++ b/engine/nbproject/build-impl.xml @@ -173,6 +173,7 @@ is divided into following sections: + @@ -255,6 +256,7 @@ is divided into following sections: Must set src.terrain.dir Must set src.jbullet.dir Must set src.bullet.dir + Must set src.bullet-native.dir Must set src.bullet-common.dir Must set src.networking.dir Must set src.niftygui.dir @@ -287,7 +289,7 @@ is divided into following sections: - + @@ -327,7 +329,7 @@ is divided into following sections: - + @@ -359,7 +361,7 @@ is divided into following sections: - + @@ -657,7 +659,7 @@ is divided into following sections: - + @@ -669,6 +671,7 @@ is divided into following sections: + @@ -700,7 +703,7 @@ is divided into following sections: Must select some files in the IDE or set javac.includes - + @@ -941,6 +944,9 @@ is divided into following sections: + + + @@ -1001,6 +1007,9 @@ is divided into following sections: + + + diff --git a/engine/nbproject/configs/Native_Bullet.properties b/engine/nbproject/configs/Native_Bullet.properties new file mode 100644 index 000000000..0f00a5c33 --- /dev/null +++ b/engine/nbproject/configs/Native_Bullet.properties @@ -0,0 +1,3 @@ +$label=Native Bullet +$target.run=run-bullet-native +$target.build=build-bullet-natives diff --git a/engine/nbproject/genfiles.properties b/engine/nbproject/genfiles.properties index ecf98b35a..a8c608d9b 100644 --- a/engine/nbproject/genfiles.properties +++ b/engine/nbproject/genfiles.properties @@ -3,8 +3,8 @@ build.xml.script.CRC32=34d4c2f2 build.xml.stylesheet.CRC32=958a1d3e # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=11158891 -nbproject/build-impl.xml.script.CRC32=283800d6 +nbproject/build-impl.xml.data.CRC32=5d760efd +nbproject/build-impl.xml.script.CRC32=a73ff29f nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 nbproject/profiler-build-impl.xml.data.CRC32=aff514c1 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed diff --git a/engine/nbproject/project.properties b/engine/nbproject/project.properties index 4f00f4f3e..b3b1f00ec 100644 --- a/engine/nbproject/project.properties +++ b/engine/nbproject/project.properties @@ -105,6 +105,7 @@ source.encoding=UTF-8 src.android.dir=src/android src.blender.dir=src/blender src.bullet-common.dir=src/bullet-common +src.bullet-native.dir=src/bullet-native src.bullet.dir=src/bullet src.core-data.dir=src/core-data src.core-plugins.dir=src/core-plugins diff --git a/engine/nbproject/project.xml b/engine/nbproject/project.xml index 4ed8a1d61..29a6f2402 100644 --- a/engine/nbproject/project.xml +++ b/engine/nbproject/project.xml @@ -18,6 +18,7 @@ +