Win32: Fixed build and added DENG2_C_API_ONLY

For C++ sources, the DENG2_C_API_ONLY define ensures that the C++ headers are not included.
skyjake · May 23, 2012 · 792cbd0 · 792cbd0
1 parent a5875c3
commit 792cbd0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/doomsday/libdeng2/include/de/libdeng2.h b/doomsday/libdeng2/include/de/libdeng2.h
@@ -24,7 +24,7 @@
  * @file libdeng2.h  Common definitions for libdeng2.
  */
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(DENG2_C_API_ONLY)
 #  define DENG2_USE_QT
 #endif
 
@@ -98,7 +98,7 @@
 #define DENG2_FOR_EACH(Iter, ContainerRef, IterClass) \
     for(IterClass Iter = (ContainerRef).begin(); Iter != (ContainerRef).end(); ++Iter)
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(DENG2_C_API_ONLY)
 namespace de {
 
 /**

diff --git a/doomsday/plugins/directsound/src/driver_directsound.cpp b/doomsday/plugins/directsound/src/driver_directsound.cpp
@@ -44,7 +44,9 @@
 
 #pragma warning (disable: 4035 4244)
 
+#define DENG2_C_API_ONLY
 #include <de/c_wrapper.h>
+
 #include "doomsday.h"
 #include "sys_audiod.h"
 #include "sys_audiod_sfx.h"

diff --git a/doomsday/plugins/winmm/src/dswinmm.cpp b/doomsday/plugins/winmm/src/dswinmm.cpp
@@ -28,9 +28,11 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#include <math.h>
+#define DENG2_C_API_ONLY
 #include <de/c_wrapper.h>
 
+#include <math.h>
+
 #include "dswinmm.h"
 #include "midistream.h"