From 40a3dd7b76b6b10ae05dbd074f1f80ea7b4aa96d Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 5 Aug 2005 14:03:10 +0000
Subject: [PATCH] Renamed WinDefs.* to MacCompatibility.*, since most of it is
 Linux-specific.

---
 Source/{WinDefs.cpp => MacCompatibility.cpp} | 2 +-
 Source/{WinDefs.h => MacCompatibility.h}     | 9 +++++----
 Source/OpenGL_Windows.cpp                    | 2 +-
 Source/PhysicsMath.h                         | 4 +---
 Source/WinInput.h                            | 2 +-
 Source/fmod.h                                | 2 +-
 Source/gamegl.h                              | 2 +-
 makefile                                     | 6 ++++--
 8 files changed, 15 insertions(+), 14 deletions(-)
 rename Source/{WinDefs.cpp => MacCompatibility.cpp} (98%)
 rename Source/{WinDefs.h => MacCompatibility.h} (95%)

diff --git a/Source/WinDefs.cpp b/Source/MacCompatibility.cpp
similarity index 98%
rename from Source/WinDefs.cpp
rename to Source/MacCompatibility.cpp
index f6cba9a..86d8dff 100644
--- a/Source/WinDefs.cpp
+++ b/Source/MacCompatibility.cpp
@@ -1,5 +1,5 @@
 /**> HEADER FILES <**/
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 #include <windows.h>
 #include <errno.h>
 #include <time.h>
diff --git a/Source/WinDefs.h b/Source/MacCompatibility.h
similarity index 95%
rename from Source/WinDefs.h
rename to Source/MacCompatibility.h
index 478c744..95781f2 100644
--- a/Source/WinDefs.h
+++ b/Source/MacCompatibility.h
@@ -1,7 +1,7 @@
-#ifndef _WINDEFS_H_
-#define _WINDEFS_H_
-#ifdef WIN32
+#ifndef _MACCOMPATIBLITY_H_
+#define _MACCOMPATIBLITY_H_
 
+#if !PLATFORM_MACOSX
 
 #include <stdio.h>
 #include <float.h>
@@ -99,4 +99,5 @@ inline long long abs( long long f)
 	return f;
 }
 #endif
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 919b1cb..5c70e5f 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -60,7 +60,7 @@ extern float volume;
 #include <fstream>
 #include <iostream>
 #include "gamegl.h"
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 #include <shellapi.h>
 #include "fmod.h"
 
diff --git a/Source/PhysicsMath.h b/Source/PhysicsMath.h
index 064829e..5ae9448 100644
--- a/Source/PhysicsMath.h
+++ b/Source/PhysicsMath.h
@@ -3,9 +3,7 @@
 
 //#include <Carbon.h>
 
-#ifdef WIN32
-#include "WinDefs.h"
-#endif
+#include "MacCompatibility.h"
 
 //------------------------------------------------------------------------//
 // Misc. Constants
diff --git a/Source/WinInput.h b/Source/WinInput.h
index 3728cf2..c8880c7 100644
--- a/Source/WinInput.h
+++ b/Source/WinInput.h
@@ -4,7 +4,7 @@
 /**> HEADER FILES <**/
 #include <stdlib.h>
 #include <stdio.h>
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 
 /**> CONSTANT DECLARATIONS <**/
 // Mac Keyboard Codes
diff --git a/Source/fmod.h b/Source/fmod.h
index 729ab20..4d43dfe 100644
--- a/Source/fmod.h
+++ b/Source/fmod.h
@@ -4,7 +4,7 @@
 #define _FMODWRAPPER_H_
 
 #include "fmod_header.h"
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 
 
 #ifdef WIN32
diff --git a/Source/gamegl.h b/Source/gamegl.h
index bc36ba9..6f130c1 100644
--- a/Source/gamegl.h
+++ b/Source/gamegl.h
@@ -29,7 +29,7 @@
   #include <gl/glu.h>
   #include <gl/glaux.h>
   #include <gl/glext.h>
-  #include "WinDefs.h"
+  #include "MacCompatibility.h"
   #include "il/ilut.h"
 
   #define glDeleteTextures( a, b) glDeleteTextures( (a), (const unsigned int *)(b) );
diff --git a/makefile b/makefile
index 34e3982..e8bffd2 100644
--- a/makefile
+++ b/makefile
@@ -26,6 +26,8 @@ endif
 
 DEFINES := \
 	-DPLATFORM_UNIX=1 \
+	-DPLATFORM_LINUX=1 \
+	-DUSE_SDL=1 \
 
 INCLUDES := \
 			-I./SDL12/include \
@@ -73,9 +75,9 @@ SRCS := \
 	unpack.c \
 	unpack_private.c \
 	Weapons.cpp \
-	WinDefs.cpp \
+	MacCompatibility.cpp \
 	WinInput.cpp \
-	logger\logger.cpp \
+	logger/logger.cpp \
 	Driver.cc \
 	Md5.cc \
 
-- 
2.39.5