Merge branch 'master' of https://github.com/erwincoumans/bullet3

examples/ExampleBrowser/premake4.lua

@@ -3,7 +3,11 @@ project "App_BulletExampleBrowser"
         language "C++"
 
         kind "ConsoleApp"
-
+        
+        if os.is("Linux") then
+	        buildoptions{"-fPIC"}
+	    end
+        
         hasCL = findOpenCL("clew")
 
         if (hasCL) then
@@ -209,6 +213,10 @@ project "BulletExampleBrowserLib"
                 "../../src",
                 "../ThirdPartyLibs",
                 }
+                
+        if os.is("Linux") then
+            buildoptions{"-fPIC"}
+        end
 
 	if _OPTIONS["lua"] then
 		includedirs{"../ThirdPartyLibs/lua-5.2.3/src"}

examples/OpenGLWindow/premake4.lua

@@ -12,7 +12,11 @@
 		 	"../ThirdPartyLibs",
 		 	"../../src",
 		}
-		
+
+        if os.is("Linux") then
+            buildoptions{"-fPIC"}
+        end
+        		
 		--links {
 		--}
 		

examples/SharedMemory/CMakeLists.txt

@@ -92,13 +92,14 @@ INCLUDE_DIRECTORIES(
 	${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs
 )
 
+IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD)
+	LINK_LIBRARIES(BulletSoftBody)
+ENDIF()
+
 LINK_LIBRARIES(
  Bullet3Common BulletWorldImporter BulletFileLoader BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK
 )
 
-IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD)
-	LINK_LIBRARIES(BulletSoftBody)
-ENDIF()
 
 IF (WIN32)
         ADD_EXECUTABLE(App_PhysicsServer_SharedMemory
@@ -149,7 +150,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(-DB3_USE_STANDALONE_EXAMPLE)
 
 LINK_LIBRARIES(
- Bullet3Common BulletWorldImporter BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK OpenGLWindow
+	BulletSoftBody Bullet3Common BulletWorldImporter BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK OpenGLWindow
 )
 
 

examples/SharedMemory/premake4.lua

@@ -12,6 +12,9 @@ includedirs {".","../../src", "../ThirdPartyLibs"}
 links {
 	"BulletSoftBody", "Bullet3Common","BulletInverseDynamicsUtils", "BulletInverseDynamics",	"BulletDynamics","BulletCollision", "LinearMath", "BussIK"
 }
+if os.is("Linux") then
+    links{"dl"}
+end
 
 language "C++"
 

examples/SharedMemory/tcp/premake4.lua

@@ -73,6 +73,7 @@ links {
         end
         if os.is("Linux") then
                 defines {"_LINUX"}
+                links{"dl"}
         end
         if os.is("MacOSX") then
                 defines {"_DARWIN"}

examples/SharedMemory/udp/premake4.lua

@@ -14,6 +14,7 @@ project ("App_PhysicsServerSharedMemoryBridgeUDP")
 		links {"Ws2_32","Winmm"}
 	end
 	if os.is("Linux") then
+	    links{"dl"}
 	end
 	if os.is("MacOSX") then
 	end		
@@ -68,6 +69,9 @@ if os.is("Windows") then
 	defines { "WIN32" }
 	links {"Ws2_32","Winmm"}
 end
+	if os.is("Linux") then
+	    links{"dl"}
+	end
 
 language "C++"
 

examples/ThirdPartyLibs/BussIK/premake4.lua

@@ -5,6 +5,9 @@
 	includedirs {
 		"."
 	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	files {
 		"*.cpp",
 		"*.h",

examples/ThirdPartyLibs/Gwen/premake4.lua

@@ -11,6 +11,9 @@ end
 	
 	defines { "GWEN_COMPILE_STATIC"  }
 	 defines { "DONT_USE_GLUT"}	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	includedirs {
 		".",".."
 	}

examples/ThirdPartyLibs/clsocket/premake4.lua

@@ -16,6 +16,9 @@
 	includedirs {
 		".","include","src"
 	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	files {
 		"src/SimpleSocket.cpp",
 		"src/ActiveSocket.cpp",

examples/ThirdPartyLibs/enet/premake4.lua

@@ -18,6 +18,9 @@
 	includedirs {
 		".","include"
 	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	files {
 		"callbacks.c",
 		"compress.c",

examples/ThirdPartyLibs/lua-5.2.3/premake4.lua

@@ -18,6 +18,9 @@
 	includedirs {
 		"src"
 	}
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	files {
 		"src/*.c",
 		"src/*.h"

examples/ThirdPartyLibs/serial/premake4.lua

@@ -4,6 +4,9 @@
 	
 	includedirs {"include"}
 	
+    if os.is("Linux") then
+        buildoptions{"-fPIC"}
+    end
 	if os.is("Windows") then 
 		files{
 			 "src/impl/win.cc",