A bit more work on the cmake build system, copy glut32.dll or glut64.dll into binary directory for out-of-source builds.

Include .rc resource file (to add icon) for WIN32 cmake.
2010-02-08 08:12:04 +00:00
parent 7782952d6b
commit a6d9e977f7
30 changed files with 740 additions and 331 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.4)


+
 PROJECT(BULLET_PHYSICS)
 SET(BULLET_VERSION 2.75)

@@ -13,13 +14,31 @@ ENDIF (NOT CMAKE_BUILD_TYPE)
 OPTION(USE_DOUBLE_PRECISION "Use double precision"	OFF)
 OPTION(USE_GRAPHICAL_BENCHMARK "Use Graphical Benchmark" OFF)

+IF(MSVC)
+	OPTION(USE_MSVC_SSE "Use MSVC /arch:sse option"	ON)
+	IF (USE_MSVC_SSE)
+		ADD_DEFINITIONS(/arch:SSE)
+	ENDIF()
+	OPTION(USE_MSVC_FAST_FLOATINGPOINT "Use MSVC /fp:fast option"	ON)
+	IF (USE_MSVC_FAST_FLOATINGPOINT)
+		ADD_DEFINITIONS(/fp:fast)
+  ENDIF()
+ENDIF(MSVC)

 IF (WIN32)
-OPTION(CREATE_MSVC_RELATIVE_PATH_PROJECTFILES "Create MSVC projectfiles with relative paths" OFF)
-IF (CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+OPTION(INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES "Create MSVC projectfiles that can be distributed" OFF)
+
+IF (INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR})
+ENDIF()
+
+OPTION(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES "Create MSVC projectfiles with relative paths" OFF)
+	
+IF (INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
 SET(CMAKE_SUPPRESS_REGENERATION  1)
 SET(CMAKE_USE_RELATIVE_PATHS 1)
-ENDIF(CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+
 ENDIF (WIN32)

 OPTION(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES "Internal update serialization structures" OFF)
@@ -87,16 +106,13 @@ IF (USE_GLUT)
 	ENDIF (MINGW)

 	IF (MSVC)
-	MESSAGE ("GLUT NOT FOUND, trying to use Bullet/Glut/glut32.lib for MSVC")
-
-
-IF (CMAKE_CL_64)
-	message("win64 using glut64.lib")
-	SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)
-ELSE(CMAKE_CL_64)
-	message("win32 using glut32.lib")
-	SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)
-ENDIF (CMAKE_CL_64)
+		IF (CMAKE_CL_64)
+			message("Win64 using Glut/glut64.lib")
+			SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)
+		ELSE(CMAKE_CL_64)
+			message("Win32 using Glut/glut32.lib")
+			SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)
+		ENDIF (CMAKE_CL_64)
 	
 	ENDIF (MSVC)
 	ENDIF (GLUT_FOUND)
--- a/Demos/AllBulletDemos/CMakeLists.txt
+++ b/Demos/AllBulletDemos/CMakeLists.txt
@@ -28,9 +28,7 @@ LINK_LIBRARIES(
 GLUI  GIMPACTUtils ConvexDecomposition OpenGLSupport  BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletFileLoader LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

-
-
-ADD_EXECUTABLE(AppAllBulletDemos
+SET(AllBulletDemos_SRCS
 	Main.cpp
 	DemoEntries.cpp
 	 ../CcdPhysicsDemo/CcdPhysicsDemo.cpp
@@ -53,19 +51,32 @@ ADD_EXECUTABLE(AppAllBulletDemos
  ../ConstraintDemo/ConstraintDemo.cpp
 )

+IF (WIN32)
+	ADD_EXECUTABLE(AppAllBulletDemos
+		${AllBulletDemos_SRCS}
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppAllBulletDemos
+		${AllBulletDemos_SRCS}
+	)
+ENDIF()
+

 IF (WIN32)
-	IF (CMAKE_CL_64)
-		ADD_CUSTOM_COMMAND(
-			TARGET AppAllBulletDemos
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-		)
-	ELSE(CMAKE_CL_64)
-		ADD_CUSTOM_COMMAND(
-			TARGET AppAllBulletDemos
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-		)
-	ENDIF(CMAKE_CL_64)
+	IF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppAllBulletDemos
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppAllBulletDemos
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
 ENDIF(WIN32)
--- a/Demos/BasicDemo/CMakeLists.txt
+++ b/Demos/BasicDemo/CMakeLists.txt
@@ -22,38 +22,58 @@ IF (USE_GLUT)
 	OpenGLSupport  BulletDynamics  BulletCollision LinearMath  ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

+IF (WIN32)
+ADD_EXECUTABLE(AppBasicDemo
+		main.cpp
+		BasicDemo.cpp 
+		BasicDemo.h
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
 	ADD_EXECUTABLE(AppBasicDemo
 		main.cpp
 		BasicDemo.cpp 
 		BasicDemo.h
 	)
+ENDIF()
+
+

 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppBasicDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppBasicDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppBasicDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppBasicDemo
+					POST_BUILD
+#		  		COMMAND copy /Y ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)

+
+
 	LINK_LIBRARIES(
 	OpenGLSupport  BulletDynamics  BulletCollision LinearMath  ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

+
 	ADD_EXECUTABLE(AppBasicDemo
 		WIN32
 		../OpenGL/Win32AppMain.cpp
 		Win32BasicDemo.cpp
 		BasicDemo.cpp 
 		BasicDemo.h
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 	)
+	
+	
 ENDIF (USE_GLUT)
--- a/Demos/Benchmarks/CMakeLists.txt
+++ b/Demos/Benchmarks/CMakeLists.txt
@@ -18,25 +18,36 @@ IF (USE_GLUT)
 	LINK_LIBRARIES(
 	OpenGLSupport BulletDynamics  BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)
-	ADD_EXECUTABLE(AppBenchmarks
-		main.cpp
-		BenchmarkDemo.cpp 
-		BenchmarkDemo.h
-	)
 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppBenchmarks
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppBenchmarks
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		ADD_EXECUTABLE(AppBenchmarks
+			main.cpp
+			BenchmarkDemo.cpp 
+			BenchmarkDemo.h
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		)
+	ELSE()
+		ADD_EXECUTABLE(AppBenchmarks
+			main.cpp
+			BenchmarkDemo.cpp 
+			BenchmarkDemo.h
+		)
+	ENDIF ()
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppBenchmarks
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppBenchmarks
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
 	INCLUDE_DIRECTORIES(
@@ -54,6 +65,7 @@ ELSE (USE_GLUT)
 		BenchmarkDemo.cpp 
 		BenchmarkDemo.h
 		Win32BenchmarkDemo.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 	)
 ENDIF (USE_GLUT)
 ELSE (USE_GRAPHICAL_BENCHMARK)
--- a/Demos/Box2dDemo/CMakeLists.txt
+++ b/Demos/Box2dDemo/CMakeLists.txt
@@ -17,32 +17,43 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL

 IF (USE_GLUT)
 	LINK_LIBRARIES(
-	OpenGLSupport  BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+		OpenGLSupport  BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

-	ADD_EXECUTABLE(AppBox2dDemo
-		main.cpp
-		Box2dDemo.cpp
-		Box2dDemo.h
-	)
 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppBox2dDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppBox2dDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		ADD_EXECUTABLE(AppBox2dDemo
+			main.cpp
+			Box2dDemo.cpp
+			Box2dDemo.h
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		)
+	ELSE()
+		ADD_EXECUTABLE(AppBox2dDemo
+			main.cpp
+			Box2dDemo.cpp
+			Box2dDemo.h
+		)
+	ENDIF()
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppBox2dDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppBox2dDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
-LINK_LIBRARIES(
-	OpenGLSupport  BulletDynamics  BulletCollision LinearMath  ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+	LINK_LIBRARIES(
+		OpenGLSupport  BulletDynamics  BulletCollision LinearMath  ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

 	ADD_EXECUTABLE(AppBox2dDemo
@@ -51,6 +62,7 @@ LINK_LIBRARIES(
 		Win32Box2dDemo.cpp
 		Box2dDemo.cpp
 		Box2dDemo.h
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 	)
 ENDIF (USE_GLUT)

--- a/Demos/BspDemo/CMakeLists.txt
+++ b/Demos/BspDemo/CMakeLists.txt
@@ -24,3 +24,31 @@ ADD_EXECUTABLE(AppBspPhysicsDemo
 	BspConverter.cpp	
 )

+
+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppBspPhysicsDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppBspPhysicsDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
+
+
+
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ADD_CUSTOM_COMMAND(
+		TARGET AppBspPhysicsDemo
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/BspDemo.bsp ${CMAKE_CURRENT_BINARY_DIR}
+	)
+ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
--- a/Demos/CcdPhysicsDemo/CMakeLists.txt
+++ b/Demos/CcdPhysicsDemo/CMakeLists.txt
@@ -19,8 +19,33 @@ LINK_LIBRARIES(
 OpenGLSupport  BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

-ADD_EXECUTABLE(AppCcdPhysicsDemo
-	main.cpp
-	CcdPhysicsDemo.cpp
-)
+IF (WIN32)
+	ADD_EXECUTABLE(AppCcdPhysicsDemo
+		main.cpp
+		CcdPhysicsDemo.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppCcdPhysicsDemo
+		main.cpp
+		CcdPhysicsDemo.cpp
+	)
+ENDIF()

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppCcdPhysicsDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppCcdPhysicsDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/CharacterDemo/CMakeLists.txt
+++ b/Demos/CharacterDemo/CMakeLists.txt
@@ -16,8 +16,8 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL
 LINK_LIBRARIES(
 OpenGLSupport  BulletDynamics BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )
+SET(CharacterDemo_SRCS

-ADD_EXECUTABLE(AppCharacterDemo
 	DynamicCharacterController.cpp
 	DynamicCharacterController.h
 	CharacterDemo.cpp
@@ -29,3 +29,39 @@ ADD_EXECUTABLE(AppCharacterDemo
 	main.cpp
 )

+IF (WIN32)
+	ADD_EXECUTABLE(AppCharacterDemo
+		${CharacterDemo_SRCS}
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppCharacterDemo
+		${CharacterDemo_SRCS}
+	)
+ENDIF()
+
+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppCharacterDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppCharacterDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
+
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ADD_CUSTOM_COMMAND(
+		TARGET AppCharacterDemo
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/BspDemo.bsp ${CMAKE_CURRENT_BINARY_DIR}
+	)
+ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
--- a/Demos/CollisionDemo/CMakeLists.txt
+++ b/Demos/CollisionDemo/CMakeLists.txt
@@ -18,7 +18,14 @@ LINK_LIBRARIES(
 OpenGLSupport BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

-ADD_EXECUTABLE(AppCollisionDemo
-        CollisionDemo.cpp
-)
+IF (WIN32)
+	ADD_EXECUTABLE(AppCollisionDemo
+			CollisionDemo.cpp
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppCollisionDemo
+			CollisionDemo.cpp
+	)
+ENDIF()

--- a/Demos/CollisionInterfaceDemo/CMakeLists.txt
+++ b/Demos/CollisionInterfaceDemo/CMakeLists.txt
@@ -19,26 +19,36 @@ IF (USE_GLUT)
 	OpenGLSupport BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

-	ADD_EXECUTABLE(AppCollisionInterfaceDemo
-			CollisionInterfaceDemo.cpp
-			CollisionInterfaceDemo.h
-			main.cpp
-	        
-	)
 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppCollisionInterfaceDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppCollisionInterfaceDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		ADD_EXECUTABLE(AppCollisionInterfaceDemo
+				CollisionInterfaceDemo.cpp
+				CollisionInterfaceDemo.h
+				main.cpp
+				${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		)
+	ELSE()
+		ADD_EXECUTABLE(AppCollisionInterfaceDemo
+				CollisionInterfaceDemo.cpp
+				CollisionInterfaceDemo.h
+				main.cpp
+		)
+	ENDIF()
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppCollisionInterfaceDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppCollisionInterfaceDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
 	INCLUDE_DIRECTORIES(
@@ -50,11 +60,12 @@ ELSE (USE_GLUT)
 	)

 	ADD_EXECUTABLE(AppCollisionInterfaceDemo
-	WIN32
+		WIN32
 			CollisionInterfaceDemo.cpp
 			CollisionInterfaceDemo.h
 			Win32CollisionInterfaceDemo.cpp
 			../OpenGL/Win32AppMain.cpp
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 	)
 ENDIF (USE_GLUT)

--- a/Demos/ConcaveConvexcastDemo/CMakeLists.txt
+++ b/Demos/ConcaveConvexcastDemo/CMakeLists.txt
@@ -23,3 +23,20 @@ ADD_EXECUTABLE(AppConcaveConvexCastDemo
        main.cpp
 )

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppConcaveConvexCastDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppConcaveConvexCastDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/ConcaveDemo/CMakeLists.txt
+++ b/Demos/ConcaveDemo/CMakeLists.txt
@@ -18,24 +18,34 @@ IF (USE_GLUT)
 	OpenGLSupport BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

-	ADD_EXECUTABLE(AppConcaveDemo
-        	ConcavePhysicsDemo.cpp
-        	main.cpp
-	)
 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppConcaveDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppConcaveDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		ADD_EXECUTABLE(AppConcaveDemo
+        		ConcavePhysicsDemo.cpp
+        		main.cpp
+        		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		)
+	ELSE()
+	ADD_EXECUTABLE(AppConcaveDemo
+        		ConcavePhysicsDemo.cpp
+        		main.cpp
+		)
+	ENDIF()
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppConcaveDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppConcaveDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
 	
@@ -53,6 +63,7 @@ ELSE (USE_GLUT)
        	ConcavePhysicsDemo.cpp
        	ConcaveDemo.h
        	Win32ConcaveDemo.cpp
+        	${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 	)

 ENDIF (USE_GLUT)
--- a/Demos/ConcaveRaycastDemo/CMakeLists.txt
+++ b/Demos/ConcaveRaycastDemo/CMakeLists.txt
@@ -18,8 +18,16 @@ LINK_LIBRARIES(
 OpenGLSupport BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

-ADD_EXECUTABLE(AppConcaveRayCastDemo
-        ConcaveRaycastDemo.cpp
-        main.cpp
-)
+IF (WIN32)
+	ADD_EXECUTABLE(AppConcaveRayCastDemo
+			ConcaveRaycastDemo.cpp
+			main.cpp
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppConcaveRayCastDemo
+			ConcaveRaycastDemo.cpp
+			main.cpp
+	)
+ENDIF()

--- a/Demos/ConstraintDemo/CMakeLists.txt
+++ b/Demos/ConstraintDemo/CMakeLists.txt
@@ -29,20 +29,22 @@ IF (USE_GLUT)
 			ConstraintDemo.h
 			main.cpp
 	)
-	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppConstraintDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppConstraintDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppConcaveDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppConcaveDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
 	LINK_LIBRARIES(
--- a/Demos/ContinuousConvexCollision/CMakeLists.txt
+++ b/Demos/ContinuousConvexCollision/CMakeLists.txt
@@ -22,3 +22,20 @@ ADD_EXECUTABLE(AppContinuousConvexCollisionDemo
        ContinuousConvexCollisionDemo.cpp
 )

+IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppContinuousConvexCollisionDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppContinuousConvexCollisionDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/ConvexDecompositionDemo/CMakeLists.txt
+++ b/Demos/ConvexDecompositionDemo/CMakeLists.txt
@@ -1,71 +1,74 @@
-# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
-
-
-# For every executable you have with a main method you should have an add_executable line below.
-# For every add executable line you should list every .cpp and .h file you have associated with that executable.  
-
-
-# This is the variable for Windows.  I use this to define the root of my directory structure.
-SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
-
-# You shouldn't have to modify anything below this line 
-########################################################
-
-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src 
-${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
-)
-
-IF (USE_GLUT)
-
-	LINK_LIBRARIES(
-	OpenGLSupport  BulletWorldImporter  BulletDynamics  BulletCollision LinearMath  BulletFileLoader ConvexDecomposition ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
-	)
-
-	ADD_EXECUTABLE(AppConvexDecompositionDemo
-		main.cpp
-		ConvexDecompositionDemo.cpp 
-		ConvexDecompositionDemo.h
-	)
-	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppConvexDecompositionDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppConvexDecompositionDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
-	ENDIF(WIN32)
-ELSE (USE_GLUT)
-
-LINK_LIBRARIES(
-	OpenGLSupport  BulletWorldImporter BulletDynamics  BulletCollision LinearMath  BulletFileLoader ConvexDecomposition ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
-	)
-
-	ADD_EXECUTABLE(AppConvexDecompositionDemo
-		WIN32
-		../OpenGL/Win32AppMain.cpp
-		ConvexDecompositionDemo.cpp 
-		ConvexDecompositionDemo.h
-		Win32ConvexDecompositionDemo.cpp
-	)
-	
-ENDIF (USE_GLUT)
-
-
-ADD_CUSTOM_COMMAND(
-TARGET AppConvexDecompositionDemo
-POST_BUILD
-COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/ConvexDecompositionDemo/testFile32Single.bullet ${CMAKE_CURRENT_BINARY_DIR}
-COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/file.obj ${CMAKE_CURRENT_BINARY_DIR}
-)
-
+# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
+
+
+# For every executable you have with a main method you should have an add_executable line below.
+# For every add executable line you should list every .cpp and .h file you have associated with that executable.  
+
+
+# This is the variable for Windows.  I use this to define the root of my directory structure.
+SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
+
+# You shouldn't have to modify anything below this line 
+########################################################
+
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/src 
+${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
+)
+
+IF (USE_GLUT)
+
+	LINK_LIBRARIES(
+	OpenGLSupport  BulletWorldImporter  BulletDynamics  BulletCollision LinearMath  BulletFileLoader ConvexDecomposition ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+	)
+
+	ADD_EXECUTABLE(AppConvexDecompositionDemo
+		main.cpp
+		ConvexDecompositionDemo.cpp 
+		ConvexDecompositionDemo.h
+	)
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppConvexDecompositionDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppConvexDecompositionDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ENDIF(WIN32)
+ELSE (USE_GLUT)
+
+LINK_LIBRARIES(
+	OpenGLSupport  BulletWorldImporter BulletDynamics  BulletCollision LinearMath  BulletFileLoader ConvexDecomposition ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+	)
+
+	ADD_EXECUTABLE(AppConvexDecompositionDemo
+		WIN32
+		../OpenGL/Win32AppMain.cpp
+		ConvexDecompositionDemo.cpp 
+		ConvexDecompositionDemo.h
+		Win32ConvexDecompositionDemo.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+	
+ENDIF (USE_GLUT)
+
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ADD_CUSTOM_COMMAND(
+	TARGET AppConvexDecompositionDemo
+	POST_BUILD
+	COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/testFileOriginal.bullet  ${CMAKE_CURRENT_BINARY_DIR}/testFile32Single.bullet
+	COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/file.obj ${CMAKE_CURRENT_BINARY_DIR}
+	)
+ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
--- a/Demos/DoublePrecisionDemo/CMakeLists.txt
+++ b/Demos/DoublePrecisionDemo/CMakeLists.txt
@@ -22,3 +22,20 @@ ADD_EXECUTABLE(AppDoublePrecisionDemo
        DoublePrecisionDemo.cpp
 )

+IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppDoublePrecisionDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppDoublePrecisionDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/DynamicControlDemo/CMakeLists.txt
+++ b/Demos/DynamicControlDemo/CMakeLists.txt
@@ -23,3 +23,20 @@ ADD_EXECUTABLE(AppMotorDemo
        main.cpp
 )

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppMotorDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppMotorDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/ForkLiftDemo/CMakeLists.txt
+++ b/Demos/ForkLiftDemo/CMakeLists.txt
@@ -11,52 +11,43 @@ SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
 # You shouldn't have to modify anything below this line 
 ########################################################

-
-# This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system
-# This should be the case.
-INCLUDE (${CMAKE_ROOT}/Modules/FindGLU.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/FindGLUT.cmake) 
-INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
-
-
-IF (WIN32)
-  # This is the Windows code for which Opengl, and Glut are not properly installed
-  # since I can't install them I must cheat and copy libraries around
-  INCLUDE_DIRECTORIES(${GLUT_ROOT})
- # LINK_DIRECTORIES(${GLUT_ROOT}\\lib)
-  IF (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
-  SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)
- #   LINK_LIBRARIES(${GLUT_ROOT}\\lib\\glut32 ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
- #   TARGET_LINK_LIBRARIES(table ${GLUT_ROOT}\\lib\\glut32)
-#
-#    ADD_CUSTOM_COMMAND(TARGET table POST_BUILD COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2005\\Debug
-#                        COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2003\\Debug 
-#            COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs6\\Debug)
-  ELSE (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
-#    LINK_LIBRARIES(${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}) 
-#    TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY})
-  ENDIF(${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
-#  TARGET_LINK_LIBRARIES(table ${OPENGL_gl_LIBRARY})
-#  TARGET_LINK_LIBRARIES(table ${OPENGL_glu_LIBRARY}) 
-ELSE (WIN32)
-  # This is the lines for linux.  This should always work if everything is installed and working fine.
-#  SET(CMAKE_BUILD_TYPE Debug)
-#  SET(CMAKE_CXX_FLAGS_DEBUG "-g")
-  INCLUDE_DIRECTORIES(/usr/include /usr/local/include ${GLUT_INCLUDE_DIR}) 
-#  TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
-#  TARGET_LINK_LIBRARIES(checker ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
-ENDIF (WIN32)
-
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+	${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
 OpenGLSupport BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

-ADD_EXECUTABLE(AppForkLiftDemo
-	ForkLiftDemo.cpp
-	main.cpp
-)
+IF (WIN32)
+	ADD_EXECUTABLE(AppForkLiftDemo
+		ForkLiftDemo.cpp
+		main.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+	
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppForkLiftDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppForkLiftDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ENDIF(WIN32)
+	
+ELSE()
+	ADD_EXECUTABLE(AppForkLiftDemo
+		ForkLiftDemo.cpp
+		main.cpp
+	)
+ENDIF()

--- a/Demos/GenericJointDemo/CMakeLists.txt
+++ b/Demos/GenericJointDemo/CMakeLists.txt
@@ -19,26 +19,38 @@ IF (USE_GLUT)
 	OpenGLSupport BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

-	ADD_EXECUTABLE(AppGenericJointDemo
-		GenericJointDemo.cpp
-		GenericJointDemo.h
-		Ragdoll.cpp
-		main.cpp
-	)
 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppGenericJointDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppGenericJointDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		ADD_EXECUTABLE(AppGenericJointDemo
+			GenericJointDemo.cpp
+			GenericJointDemo.h
+			Ragdoll.cpp
+			main.cpp
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		)
+	ELSE()
+		ADD_EXECUTABLE(AppGenericJointDemo
+			GenericJointDemo.cpp
+			GenericJointDemo.h
+			Ragdoll.cpp
+			main.cpp
+		)
+	ENDIF()
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppGenericJointDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppGenericJointDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)

 ELSE(USE_GLUT)
@@ -58,6 +70,7 @@ ELSE(USE_GLUT)
 		GenericJointDemo.cpp
 		GenericJointDemo.h
 		Ragdoll.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 		
 	)
 ENDIF (USE_GLUT)
--- a/Demos/GjkConvexCastDemo/CMakeLists.txt
+++ b/Demos/GjkConvexCastDemo/CMakeLists.txt
@@ -23,3 +23,20 @@ ADD_EXECUTABLE(AppLinearConvexCastDemo
        main.cpp
 )

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppLinearConvexCastDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppLinearConvexCastDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/HelloWorld/CMakeLists.txt
+++ b/Demos/HelloWorld/CMakeLists.txt
@@ -8,7 +8,14 @@ LINK_LIBRARIES(
 BulletDynamics BulletCollision LinearMath 
 )

-ADD_EXECUTABLE(AppHelloWorld
-	HelloWorld.cpp 
-)
+IF (WIN32)
+	ADD_EXECUTABLE(AppHelloWorld
+		HelloWorld.cpp 
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppHelloWorld
+		HelloWorld.cpp 
+	)
+ENDIF()

--- a/Demos/InternalEdgeDemo/CMakeLists.txt
+++ b/Demos/InternalEdgeDemo/CMakeLists.txt
@@ -24,19 +24,21 @@ IF (USE_GLUT)
        	main.cpp
 	)
 	IF (WIN32)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppInternalEdgeDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppInternalEdgeDemo
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppInternalEdgeDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppInternalEdgeDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
 	
--- a/Demos/RagdollDemo/CMakeLists.txt
+++ b/Demos/RagdollDemo/CMakeLists.txt
@@ -23,3 +23,20 @@ ADD_EXECUTABLE(AppRagdollDemo
 	main.cpp
 )

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppRagdollDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppRagdollDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/SerializeDemo/CMakeLists.txt
+++ b/Demos/SerializeDemo/CMakeLists.txt
@@ -24,11 +24,20 @@ IF (USE_GLUT)
 	OpenGLSupport  BulletWorldImporter BulletDynamics  BulletCollision LinearMath BulletFileLoader  ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)

-	ADD_EXECUTABLE(AppSerializeDemo
-		main.cpp
-		SerializeDemo.cpp 
-		SerializeDemo.h
-	)
+	IF (WIN32)
+		ADD_EXECUTABLE(AppSerializeDemo
+			main.cpp
+			SerializeDemo.cpp 
+			SerializeDemo.h
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		)
+	ELSE()
+		ADD_EXECUTABLE(AppSerializeDemo
+			main.cpp
+			SerializeDemo.cpp 
+			SerializeDemo.h
+		)
+	ENDIF()
 	
 IF (WIN32)
 	IF (CMAKE_CL_64)
@@ -59,12 +68,15 @@ ELSE (USE_GLUT)
 		Win32SerializeDemo.cpp
 		SerializeDemo.cpp 
 		SerializeDemo.h
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 	)
 ENDIF (USE_GLUT)

-ADD_CUSTOM_COMMAND(
-TARGET AppSerializeDemo 
-POST_BUILD
-COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SerializeDemo/testFile.bullet ${CMAKE_CURRENT_BINARY_DIR}
-)
-
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ADD_CUSTOM_COMMAND(
+		TARGET AppSerializeDemo 
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/testFileOriginal.bullet ${CMAKE_CURRENT_BINARY_DIR}/testFile.bullet
+####### COMMAND copy /Y \"${BULLET_PHYSICS_SOURCE_DIR}/Demos/SerializeDemo/testFile.bullet\" \"${CMAKE_CURRENT_BINARY_DIR}\"
+	)
+ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
--- a/Demos/SimplexDemo/CMakeLists.txt
+++ b/Demos/SimplexDemo/CMakeLists.txt
@@ -22,3 +22,20 @@ ADD_EXECUTABLE(AppSimplexDemo
        SimplexDemo.cpp
 )

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppSimplexDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppSimplexDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/SliderConstraintDemo/CMakeLists.txt
+++ b/Demos/SliderConstraintDemo/CMakeLists.txt
@@ -24,3 +24,20 @@ ADD_EXECUTABLE(AppSliderConstraintDemo
 		main.cpp
 )

+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppSliderConstraintDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppSliderConstraintDemo
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+ENDIF(WIN32)
--- a/Demos/SoftDemo/CMakeLists.txt
+++ b/Demos/SoftDemo/CMakeLists.txt
@@ -12,35 +12,46 @@

 IF (USE_GLUT)

+	INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+	)

-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
-)
+	LINK_LIBRARIES(
+	OpenGLSupport  BulletSoftBody BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+	)

-LINK_LIBRARIES(
-OpenGLSupport  BulletSoftBody BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
-)
-
-ADD_EXECUTABLE(AppSoftBodyDemo
-	main.cpp
-	SoftDemo.cpp
-)
-
-IF (WIN32)
-	IF (CMAKE_CL_64)
-		ADD_CUSTOM_COMMAND(
-			TARGET AppSoftBodyDemo
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+	IF (WIN32)
+		ADD_EXECUTABLE(AppSoftBodyDemo
+			main.cpp
+			SoftDemo.cpp
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
 		)
-	ELSE(CMAKE_CL_64)
-		ADD_CUSTOM_COMMAND(
-			TARGET AppSoftBodyDemo
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+	ELSE()
+		ADD_EXECUTABLE(AppSoftBodyDemo
+			main.cpp
+			SoftDemo.cpp
+			
 		)
-	ENDIF(CMAKE_CL_64)
-ENDIF(WIN32)
+	ENDIF()
+
+	IF (WIN32)
+		IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppSoftBodyDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppSoftBodyDemo
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ENDIF(WIN32)
+

 ELSE(USE_GLUT)

--- a/Demos/UserCollisionAlgorithm/CMakeLists.txt
+++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt
@@ -19,7 +19,13 @@ LINK_LIBRARIES(
 OpenGLSupport   BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )

-ADD_EXECUTABLE(AppUserCollisionAlgorithm
-	UserCollisionAlgorithm.cpp
-)
-
+IF (WIN32)
+	ADD_EXECUTABLE(AppUserCollisionAlgorithm
+		UserCollisionAlgorithm.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppUserCollisionAlgorithm
+		UserCollisionAlgorithm.cpp
+	)
+ENDIF()
--- a/msvc/bullet.rc
+++ b/msvc/bullet.rc
@@ -0,0 +1,29 @@
+// This file is generated automatically.
+
+1 VERSIONINFO
+FILEVERSION 2, 76, 0, 0
+PRODUCTVERSION 2, 76, 0, 0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+  BLOCK "StringFileInfo"
+  {
+    BLOCK "040904E4"
+    {
+      VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library"
+      VALUE "ProductVersion", "2.76"
+      VALUE "FileVersion", "2.76"
+      VALUE "LegalCopyright", "Copyright (c) 2005-2010  Erwin Coumans"
+#ifdef CS_DEBUG
+      VALUE "Comments", "Debug build"
+#else
+      VALUE "Comments", "Release build"
+#endif
+      VALUE "WWW", "http://www.bulletphysics.org"
+    }
+  }
+}
+1 ICON "bullet_ico.ico"