From a34761232d38b0e288ceba866397f8902e82a80f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Tue, 23 Nov 2010 21:12:23 +0000
Subject: [PATCH] MSVC build fixes.

---
 CMakeLists.txt | 40 ++++++++++++++++++++--------------------
 log.cpp        |  6 +-----
 os_posix.cpp   |  7 +++++++
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f2ccfd..b7f98f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,28 +100,28 @@ if (WIN32)
 	set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/wrappers)
 
 	# d3d8.dll
-	if (DirectX_D3D8_FOUND)
-		include_directories (${DirectX_D3D8_INCLUDE_DIR})
-		add_custom_command (
-			OUTPUT d3d8.cpp
-			COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
-			DEPENDS d3d8.py d3d8types.py d3d8caps.py windows.py base.py
-		)
-		add_library (d3d8 SHARED d3d8.def d3d8.cpp log.cpp os_win32.cpp)
-		set_target_properties (d3d8 PROPERTIES PREFIX "")
-	endif (DirectX_D3D8_FOUND)
+    #if (DirectX_D3D8_FOUND)
+	#	include_directories (${DirectX_D3D8_INCLUDE_DIR})
+	#	add_custom_command (
+	#		OUTPUT d3d8.cpp
+	#		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
+	#		DEPENDS d3d8.py d3d8types.py d3d8caps.py windows.py base.py
+	#	)
+	#	add_library (d3d8 SHARED d3d8.def d3d8.cpp log.cpp os_win32.cpp)
+	#	set_target_properties (d3d8 PROPERTIES PREFIX "")
+	#endif (DirectX_D3D8_FOUND)
 
 	# d3d9.dll
-	if (DirectX_D3DX9_FOUND)
-		include_directories (${DirectX_D3DX9_INCLUDE_DIR})
-		add_custom_command (
-			OUTPUT d3d9.cpp
-			COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
-			DEPENDS d3d9.py d3d9types.py d3d9caps.py d3dshader.py windows.py base.py
-		)
-		add_library (d3d9 SHARED d3d9.def d3d9.cpp log.cpp os_win32.cpp)
-		set_target_properties (d3d9 PROPERTIES PREFIX "")
-	endif (DirectX_D3DX9_FOUND)
+    #if (DirectX_D3DX9_FOUND)
+	#	include_directories (${DirectX_D3DX9_INCLUDE_DIR})
+	#	add_custom_command (
+	#		OUTPUT d3d9.cpp
+	#		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
+	#		DEPENDS d3d9.py d3d9types.py d3d9caps.py d3dshader.py windows.py base.py
+	#	)
+	#	add_library (d3d9 SHARED d3d9.def d3d9.cpp log.cpp os_win32.cpp)
+	#	set_target_properties (d3d9 PROPERTIES PREFIX "")
+	#endif (DirectX_D3DX9_FOUND)
 
 	# d3d10.dll
 	#if (DirectX_D3D10_FOUND)
diff --git a/log.cpp b/log.cpp
index e634b65..7a5911a 100644
--- a/log.cpp
+++ b/log.cpp
@@ -199,6 +199,7 @@ void EndElement(void) { }
 
 void BeginStruct(const char *name) {
    WriteByte(Trace::TYPE_STRUCT);
+   (void)name;
 }
 
 void EndStruct(void) {
@@ -310,9 +311,4 @@ void Abort(void) {
     OS::Abort();
 }
 
-static void _uninit(void) __attribute__((destructor));
-static void _uninit(void) {
-   Close();
-}
-
 } /* namespace Log */
diff --git a/os_posix.cpp b/os_posix.cpp
index 08d9acd..3f423fe 100644
--- a/os_posix.cpp
+++ b/os_posix.cpp
@@ -30,6 +30,7 @@
 #include <pthread.h>
 
 #include "os.hpp"
+#include "log.hpp"
 
 namespace OS {
 
@@ -101,3 +102,9 @@ Abort(void)
 
 
 } /* namespace OS */
+
+static void _uninit(void) __attribute__((destructor));
+static void _uninit(void) {
+    Log::Close();
+}
+
-- 
2.7.4