Move the last bits of code out of the top source dir.

diff --git a/compat.h b/dispatch/compat.h
similarity index 64%
rename from compat.h
rename to dispatch/compat.h
index f7d95a1..53746bd 100644 (file)
--- a/compat.h
+++ b/dispatch/compat.h
@@ -29,45 +29,49 @@
 
 #ifdef __MINGW32__
 
-#define __in /**/
-#define __out /**/
-#define __inout /**/
-#define __inout_opt /**/
-#define __in_opt /**/
-#define __out_opt /**/
-#define __in_bcount(x) /**/
-#define __out_bcount(x) /**/
-#define __in_bcount_opt(x) /**/
-#define __out_bcount_opt(x) /**/
-#define __in_range(x,y) /**/
-#define __in_ecount(x) /**/
-#define __out_ecount(x) /**/
-#define __in_ecount_opt(x) /**/
-#define __out_ecount_opt(x) /**/
-#define __field_bcount(x) /**/
-#define __field_ecount(x) /**/
-#define __field_ecount_full(x) /**/
+#define __deref_out
+#define __deref_out_bcount(x)
+#define __deref_out_opt
+#define __ecount(x)
+#define __field_bcount(x)
+#define __field_ecount(x)
+#define __field_ecount_full(x)
+#define __field_ecount_opt(x)
+#define __in
+#define __in_bcount(x)
+#define __in_bcount_opt(x)
+#define __in_ecount(x)
+#define __in_ecount_opt(x)
+#define __in_opt
+#define __in_range(x,y)
+#define __in_z
+#define __in_z_opt
 #define __inline static __inline__
-#define __deref_out /**/
-#define __deref_out_opt /**/
-#define __deref_out_bcount(x) /**/
-#define __maybenull /**/
-#define __in_z /**/
-#define __in_z_opt /**/
-#define __out_z /**/
-#define __out_ecount_z(x) /**/
-#define __nullterminated /**/
-#define __notnull /**/
-#define __field_ecount_opt(x) /**/
-#define __range(x,y) /**/
-#define __out_ecount_part_opt(x,y) /**/
+#define __inout
+#define __inout_opt
+#define __maybenull
+#define __notnull
+#define __nullterminated
+#define __out
+#define __out_bcount(x)
+#define __out_bcount_full_opt(x)
+#define __out_bcount_opt(x)
+#define __out_ecount(x)
+#define __out_ecount_opt(x)
+#define __out_ecount_part_opt(x,y)
+#define __out_ecount_part_z_opt(x,y)
+#define __out_ecount_z(x)
+#define __out_opt
+#define __out_z
+#define __range(x,y)
+#define __success(x)
 
 #ifndef DECLSPEC_DEPRECATED
-#define DECLSPEC_DEPRECATED /**/
+#define DECLSPEC_DEPRECATED
 #endif
 
 #ifndef DECLSPEC_NOVTABLE
-#define DECLSPEC_NOVTABLE /**/
+#define DECLSPEC_NOVTABLE
 #endif
 
 #ifndef __MINGW64_VERSION_MAJOR

diff --git a/d3d9imports.hpp b/dispatch/d3d9imports.hpp
similarity index 100%
rename from d3d9imports.hpp
rename to dispatch/d3d9imports.hpp

diff --git a/eglimports.hpp b/dispatch/eglimports.hpp
similarity index 100%
rename from eglimports.hpp
rename to dispatch/eglimports.hpp

diff --git a/glimports.hpp b/dispatch/glimports.hpp
similarity index 100%
rename from glimports.hpp
rename to dispatch/glimports.hpp

diff --git a/glsize.hpp b/helpers/glsize.hpp
similarity index 100%
rename from glsize.hpp
rename to helpers/glsize.hpp

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 644fe98..5afe83a 100644 (file)
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -3,7 +3,9 @@
 
 include_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/helpers
     ${CMAKE_BINARY_DIR}/dispatch
+    ${CMAKE_SOURCE_DIR}/dispatch
 )
 
 add_definitions (-DRETRACE)

diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
index 1fb87e3..a21c4e1 100644 (file)
--- a/wrappers/CMakeLists.txt
+++ b/wrappers/CMakeLists.txt
@@ -4,7 +4,9 @@
 
 include_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/helpers
     ${CMAKE_BINARY_DIR}/dispatch
+    ${CMAKE_SOURCE_DIR}/dispatch
 )