From f6ae2f94912adc8a57e46011224a8ffdab077fa2 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ian@LunarG.com>
Date: Wed, 4 Feb 2015 15:19:32 -0700
Subject: Win: Eliminate VS2013 miscellaneous additional compiler warnings.

---
 layers/CMakeLists.txt        | 1 -
 layers/basic.cpp             | 1 -
 loader/CMakeLists.txt        | 7 ++++---
 xgl-win-def-file-generate.py | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 8235ff8f..38a10e3a 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -39,7 +39,6 @@ include_directories(
 )
 
 if (WIN32)
-    set (CMAKE_CXX_FLAGS "-std=c++11")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS")
 endif()
diff --git a/layers/basic.cpp b/layers/basic.cpp
index ac8cf803..41abf209 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -33,7 +33,6 @@ static std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *> tableMap;
 
 static XGL_LAYER_DISPATCH_TABLE * initLayerTable(const XGL_BASE_LAYER_OBJECT *gpuw)
 {
-    xglGetProcAddrType fpGPA;
     XGL_LAYER_DISPATCH_TABLE *pTable;
 
     assert(gpuw);
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 46fe8142..2d2febfe 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -16,12 +16,13 @@ if (WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS")
 
     add_library(XGL SHARED loader.c dirent_on_windows.c dispatch.c table_ops.h)
+    set_target_properties(XGL PROPERTIES SOVERSION 0)
+    target_link_libraries(XGL)
 endif()
 if (NOT WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES")
 
     add_library(XGL SHARED loader.c dispatch.c table_ops.h)
+    set_target_properties(XGL PROPERTIES SOVERSION 0)
+    target_link_libraries(XGL -ldl -lpthread)
 endif()
-
-set_target_properties(XGL PROPERTIES SOVERSION 0)
-target_link_libraries(XGL -ldl -lpthread)
diff --git a/xgl-win-def-file-generate.py b/xgl-win-def-file-generate.py
index 56016ee7..9d66caec 100755
--- a/xgl-win-def-file-generate.py
+++ b/xgl-win-def-file-generate.py
@@ -94,7 +94,7 @@ class Subcommand(object):
         pass
 
     def generate_body(self):
-        return "LIBRARY " + sys.argv[1]
+        return "LIBRARY XGLLayer" + sys.argv[1]
 
     def generate_footer(self):
         return "EXPORTS\n   xglGetProcAddr\n   xglEnumerateLayers"
-- 
cgit v1.2.3