From ad8d0e32f4a6835a42221f02defc747e2adb545d Mon Sep 17 00:00:00 2001
From: erwincoumans <erwin.coumans@gmail.com>
Date: Mon, 26 Aug 2013 21:58:55 -0700
Subject: [PATCH] expose 2 new command-line options
 [--disable_cached_cl_kernels] [--load_cl_kernels_from_disk] on Windows
 (_WIN32) debug output goes to BOTH console and Visual Studio output log
 window.

---
 Demos3/GpuDemos/main_opengl3core.cpp |  8 +++++---
 src/Bullet3Common/b3Logging.cpp      | 10 ++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Demos3/GpuDemos/main_opengl3core.cpp b/Demos3/GpuDemos/main_opengl3core.cpp
index c78658c05..0805119c7 100644
--- a/Demos3/GpuDemos/main_opengl3core.cpp
+++ b/Demos3/GpuDemos/main_opengl3core.cpp
@@ -55,6 +55,8 @@ bool dump_timings = false;
 int maxFrameCount = 102;
 extern char OpenSansData[];
 extern char* gPairBenchFileName;
+extern bool gDebugForceLoadingFromSource;
+extern bool gDebugSkipLoadingBinary;
 
 static void MyResizeCallback( float width, float height)
 {
@@ -402,7 +404,7 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
 
 void Usage()
 {
-	printf("\nprogram.exe [--selected_demo=<int>] [--cl_device=<int>] [--benchmark] [--maxFrameCount=<int>][--dump_timings] [--disable_opencl] [--cl_platform=<int>]  [--x_dim=<int>] [--y_dim=<num>] [--z_dim=<int>] [--x_gap=<float>] [--y_gap=<float>] [--z_gap=<float>] [--use_concave_mesh] [--pair_benchmark_file=<filename>] [--new_batching] [--no_instanced_collision_shapes]\n");
+	printf("\nprogram.exe [--selected_demo=<int>] [--benchmark] [--maxFrameCount=<int>][--dump_timings] [--disable_opencl] [--cl_device=<int>]  [--cl_platform=<int>] [--disable_cached_cl_kernels] [--load_cl_kernels_from_disk] [--x_dim=<int>] [--y_dim=<num>] [--z_dim=<int>] [--x_gap=<float>] [--y_gap=<float>] [--z_gap=<float>] [--use_concave_mesh] [--pair_benchmark_file=<filename>] [--new_batching] [--no_instanced_collision_shapes]\n");
 };
 
 
@@ -605,8 +607,8 @@ int main(int argc, char* argv[])
 	args.GetCmdLineArgument("y_gap", ci.gapY);
 	args.GetCmdLineArgument("z_gap", ci.gapZ);
 
-
-
+	gDebugForceLoadingFromSource = args.CheckCmdLineFlag("load_cl_kernels_from_disk");
+	gDebugSkipLoadingBinary = args.CheckCmdLineFlag("disable_cached_cl_kernels");
 #ifndef B3_NO_PROFILE
 	b3ProfileManager::Reset();
 #endif //B3_NO_PROFILE
diff --git a/src/Bullet3Common/b3Logging.cpp b/src/Bullet3Common/b3Logging.cpp
index 7586db0e7..2feded9de 100644
--- a/src/Bullet3Common/b3Logging.cpp
+++ b/src/Bullet3Common/b3Logging.cpp
@@ -27,9 +27,8 @@ void b3PrintfFuncDefault(const char* msg)
 {
 #ifdef _WIN32
 	OutputDebugStringA(msg);
-#else
-	printf("%s",msg);
 #endif
+	printf("%s",msg);
 
 }
 
@@ -37,9 +36,9 @@ void b3WarningMessageFuncDefault(const char* msg)
 {
 #ifdef _WIN32
 	OutputDebugStringA(msg);
-#else
-	printf("%s",msg);
 #endif
+	printf("%s",msg);
+
 
 }
 
@@ -48,9 +47,8 @@ void b3ErrorMessageFuncDefault(const char* msg)
 {
 #ifdef _WIN32
 	OutputDebugStringA(msg);
-#else
-	printf("%s",msg);
 #endif
+	printf("%s",msg);
     
 }