hacky hotfixes to c++11 support breaking windows build

AlloSphere-Research-Group · Oct 28, 2015 · eb08e11 · eb08e11 · LancePutnam · Oct 31, 2015
1 parent 3cafd23
commit eb08e11
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 14 deletions.
diff --git a/allocore/allocore/math/al_Functions.hpp b/allocore/allocore/math/al_Functions.hpp
@@ -58,12 +58,12 @@
 #endif
 
 // Define some standard C99 functions that Windows is too stubborn to support.
-#if defined(AL_WINDOWS)
-	#define nextafterf(x,y)	_nextafterf(x,y)
-	//float nextafterf(float x, float y);
-	#define nextafter(x,y)	_nextafter(x,y)
-	#define nextafterl(x,y)	_nextafter(x,y)
-#endif
+// #if defined(AL_WINDOWS)
+// 	#define nextafterf(x,y)	_nextafterf(x,y)
+// 	//float nextafterf(float x, float y);
+// 	#define nextafter(x,y)	_nextafter(x,y)
+// 	#define nextafterl(x,y)	_nextafter(x,y)
+// #endif
 
 
 namespace al {

diff --git a/allocore/allocore/system/al_Config.h b/allocore/allocore/system/al_Config.h
@@ -53,7 +53,7 @@
 
 #define AL_SYSTEM_LIB_VERSION 0.01
 
-#if defined(WIN32) || defined(__WINDOWS_MM__) || defined(WIN64)
+#if defined(WIN32) || defined(__WINDOWS_MM__) || defined(WIN64) || defined(AL_WINDOWS)
 	#define AL_WINDOWS 1
 
 	// Experimentally not include all of windows.h .

diff --git a/allocore/src/graphics/al_Font.cpp b/allocore/src/graphics/al_Font.cpp
@@ -17,14 +17,16 @@
 	#include FT_OUTLINE_H
 	#include FT_GLYPH_H
 
-#elif defined WIN32
+#elif defined (WIN32) || defined(AL_WINDOWS)
 
 	#include <windows.h>
 	#include <ft2build.h>
 	#include FT_FREETYPE_H
 	#include FT_OUTLINE_H
 	#include FT_GLYPH_H
 
+#else
+	#error "do not know this operating system"
 #endif
 
 extern "C" {

diff --git a/allocore/src/io/al_FileAPR.cpp b/allocore/src/io/al_FileAPR.cpp
@@ -9,7 +9,7 @@
 // for these two tasks...
 
 #include "../private/al_ImplAPR.h"
-#ifdef AL_LINUX
+#if defined(AL_LINUX) && !defined(AL_WINDOWS)
 	#include "apr-1.0/apr_file_io.h"
 	#include "apr-1.0/apr_file_info.h"
 #else

diff --git a/allocore/src/io/al_SocketAPR.cpp b/allocore/src/io/al_SocketAPR.cpp
@@ -26,7 +26,7 @@ You can actually use connect() on UDP socket as an option. In that case, you can
 #include "allocore/system/al_Printing.hpp"
 
 #include "../private/al_ImplAPR.h"
-#ifdef AL_LINUX
+#if defined(AL_LINUX) && !defined(AL_WINDOWS)
 #include "apr-1.0/apr_network_io.h"
 #else
 #include "apr-1/apr_network_io.h"

diff --git a/allocore/src/private/al_ImplAPR.h b/allocore/src/private/al_ImplAPR.h
@@ -33,7 +33,7 @@
 // need this to pick up AL_LINUX etc:
 #include "allocore/system/al_Config.h"
 
-#ifdef AL_LINUX
+#if defined(AL_LINUX) && !defined(AL_WINDOWS)
 	#include "apr-1.0/apr_general.h"
 	#include "apr-1.0/apr_errno.h"
 	#include "apr-1.0/apr_pools.h"

diff --git a/allocore/src/protocol/al_XML.cpp b/allocore/src/protocol/al_XML.cpp
@@ -1,7 +1,7 @@
 #include "allocore/protocol/al_XML.hpp"
 #include "../private/al_ImplAPR.h"
 
-#ifdef AL_LINUX
+#if defined(AL_LINUX) && !defined(AL_WINDOWS)
 #include "apr-1.0/apr_general.h"
 #include "apr-1.0/apr_xml.h"
 #include "apr-1.0/apr_file_io.h"

diff --git a/allocore/src/sound/al_Biquad.cpp b/allocore/src/sound/al_Biquad.cpp
@@ -6,6 +6,7 @@
 //
 //
 #include "allocore/sound/al_Biquad.hpp"
+#include "allocore/math/al_Constants.hpp"
 #include <stdlib.h>
 #include <cmath>
 

diff --git a/allocore/src/system/al_ThreadNative.cpp b/allocore/src/system/al_ThreadNative.cpp
@@ -138,7 +138,8 @@ struct Thread::Impl{
 	unsigned long mHandle;
 //	ThreadFunction mRoutine;
 
-	static unsigned _stdcall cThreadFunc(void * user){
+	static unsigned cThreadFunc(void * user){
+	// static unsigned _stdcall cThreadFunc(void * user){
 		ThreadFunction& tfunc = *((ThreadFunction*)user);
 		tfunc();
 		return 0;

diff --git a/allocore/src/system/al_Time.cpp b/allocore/src/system/al_Time.cpp
@@ -1,12 +1,13 @@
 #include "allocore/system/al_Time.hpp"
+#include "allocore/math/al_Constants.hpp"
 
 #define al_nsec2sec(ns)		(((al_sec)(ns)) * al_time_ns2s)
 #define al_sec2nsec(s)		((al_nsec)(s * al_time_s2ns))
 
 #define AL_TIME_USE_APR 1
 #ifdef AL_TIME_USE_APR
 
-#ifdef AL_LINUX
+#if defined(AL_LINUX) && !defined(AL_WINDOWS)
 	#include "apr-1.0/apr_time.h"
 #else
 	#include "apr-1/apr_time.h"