]> git.jsancho.org Git - lugaru.git/commitdiff
Renamed WinDefs.* to MacCompatibility.*, since most of it is Linux-specific.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 5 Aug 2005 14:03:10 +0000 (14:03 +0000)
committerRyan C. Gordon <icculus@icculus.org>
Fri, 5 Aug 2005 14:03:10 +0000 (14:03 +0000)
Source/MacCompatibility.cpp [new file with mode: 0644]
Source/MacCompatibility.h [new file with mode: 0644]
Source/OpenGL_Windows.cpp
Source/PhysicsMath.h
Source/WinDefs.cpp [deleted file]
Source/WinDefs.h [deleted file]
Source/WinInput.h
Source/fmod.h
Source/gamegl.h
makefile

diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp
new file mode 100644 (file)
index 0000000..86d8dff
--- /dev/null
@@ -0,0 +1,108 @@
+/**> HEADER FILES <**/
+#include "MacCompatibility.h"
+#include <windows.h>
+#include <errno.h>
+#include <time.h>
+#include <stdio.h>
+
+
+class AppTime
+{
+public:
+       AppTime()
+       {
+               counterRate = 1;
+               baseCounter = 0;
+               QueryPerformanceFrequency( (LARGE_INTEGER*)&counterRate);
+               QueryPerformanceCounter( (LARGE_INTEGER*)&baseCounter);
+       }
+       __int64 counterRate;            // LARGE_INTEGER type has no math functions so use int64
+       __int64 baseCounter;
+};
+static AppTime g_appTime;
+
+
+
+void CopyCStringToPascal( const char* src, unsigned char dst[256])
+{
+       int len = strlen( src);
+       dst[ 0] = len;
+       memcpy( dst + 1, src, len);
+}
+
+
+void CopyPascalStringToC( const unsigned char* src, char* dst)
+{
+       int len = src[ 0];
+       memcpy( dst, src + 1, len);
+       dst[ len] = 0;
+}
+
+
+AbsoluteTime UpTime()
+{
+       __int64 counter;
+       QueryPerformanceCounter( (LARGE_INTEGER*)&counter);
+
+       counter -= g_appTime.baseCounter;
+
+       AbsoluteTime time;
+       time.lo = (unsigned long)counter;
+       time.hi = (unsigned long)(counter >> 32);
+       return time;
+}
+
+
+Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b)
+{
+       __int64 value = a.hi;
+       value <<= 32;
+       value |= a.lo;
+       __int64 value2 = b.hi;
+       value2 <<= 32;
+       value2 |= b.lo;
+       value -= value2;
+
+       if (value <= 0)
+               return durationImmediate;
+
+       __int64 frac = value % g_appTime.counterRate;
+       value /= g_appTime.counterRate;
+
+       Duration time;
+
+       if (value == 0)
+       {
+               frac *= -1000000;
+               frac /= g_appTime.counterRate;
+               time = (Duration)frac;
+       }
+       else
+       {
+               frac *= 1000;
+               frac /= g_appTime.counterRate;
+               value *= 1000;
+               value += frac;
+               time = (Duration)value;
+       }
+
+       return time;
+}
+
+
+static char g_filename[ 256];
+char* ConvertFileName( const char* orgfilename)
+{
+       // translate filename into proper path name
+       if (orgfilename[ 0] == ':')
+               orgfilename++;
+       strcpy( g_filename, orgfilename);
+
+       for (int n = 0; g_filename[ n]; n++)
+       {
+               if (g_filename[ n] == ':')
+                       g_filename[ n] = '/';
+       }
+
+       return g_filename;
+}
diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h
new file mode 100644 (file)
index 0000000..95781f2
--- /dev/null
@@ -0,0 +1,103 @@
+#ifndef _MACCOMPATIBLITY_H_
+#define _MACCOMPATIBLITY_H_
+
+#if !PLATFORM_MACOSX
+
+#include <stdio.h>
+#include <float.h>
+
+// stuff to make Mac code compatable with Windows
+
+
+// disable warnings about double to float conversions
+#pragma warning(disable:4305)
+#pragma warning(disable:4244)
+
+// disable warnings about boolean to int conversions
+#pragma warning(disable:4800)
+
+// disable warning about unreferenced local variables
+#pragma warning(disable:4101)
+
+typedef bool Boolean;
+
+
+struct Point
+{
+       short v;
+       short h;
+};
+
+typedef signed char SInt8;
+typedef unsigned int UInt32;
+
+
+#include "Random.h"
+
+
+void CopyCStringToPascal( const char* src, unsigned char dst[256]);
+void CopyPascalStringToC( const unsigned char* src, char* dst);
+
+
+typedef struct AbsoluteTime
+{
+       unsigned long   hi;
+       unsigned long   lo;
+} AbsoluteTime; 
+
+AbsoluteTime UpTime();         // NOTE: returns time since app started, not system start
+
+typedef long Duration; 
+
+enum
+{
+       durationMicrosecond             = -1,
+       durationMillisecond             = 1,
+       durationSecond                  = 1000,
+       durationMinute                  = 1000 * 60,
+       durationHour                    = 1000 * 60 * 60,
+       durationDay                     = 1000 * 60 * 60 * 24,
+       durationForever                 = 0x7FFFFFFF,
+       durationImmediate               = 0,
+}; 
+
+Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b);
+
+
+inline bool isnormal( double x)
+{
+       int ret = _fpclass( x);
+       return (ret == _FPCLASS_NN || ret == _FPCLASS_PN);
+}
+
+typedef unsigned int uintptr_t;
+
+
+// fix file names to use '/' instead of ':'
+char* ConvertFileName( const char* orgfilename);
+
+#define fopen( a, b) fopen( ConvertFileName( a), b);
+/*
+inline float abs( float f)
+{
+if (f < 0)
+return -f;
+return f;
+}
+
+inline double abs( double f)
+{
+if (f < 0)
+return -f;
+return f;
+}
+*/
+inline long long abs( long long f)
+{
+       if (f < 0)
+               return -f;
+       return f;
+}
+#endif
+#endif
+
index 919b1cb612c46cbf5bec42eeeb9a8b119fa8eda6..5c70e5fd2c9b9dd69cec14263996e0f8f3628b66 100644 (file)
@@ -60,7 +60,7 @@ extern float volume;
 #include <fstream>
 #include <iostream>
 #include "gamegl.h"
 #include <fstream>
 #include <iostream>
 #include "gamegl.h"
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 #include <shellapi.h>
 #include "fmod.h"
 
 #include <shellapi.h>
 #include "fmod.h"
 
index 064829e883c575f8e8532af729a6cb2a6df096ef..5ae94481c5b4e00f4d0c258a1f24542d1f71decb 100644 (file)
@@ -3,9 +3,7 @@
 
 //#include <Carbon.h>
 
 
 //#include <Carbon.h>
 
-#ifdef WIN32
-#include "WinDefs.h"
-#endif
+#include "MacCompatibility.h"
 
 //------------------------------------------------------------------------//
 // Misc. Constants
 
 //------------------------------------------------------------------------//
 // Misc. Constants
diff --git a/Source/WinDefs.cpp b/Source/WinDefs.cpp
deleted file mode 100644 (file)
index f6cba9a..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/**> HEADER FILES <**/
-#include "WinDefs.h"
-#include <windows.h>
-#include <errno.h>
-#include <time.h>
-#include <stdio.h>
-
-
-class AppTime
-{
-public:
-       AppTime()
-       {
-               counterRate = 1;
-               baseCounter = 0;
-               QueryPerformanceFrequency( (LARGE_INTEGER*)&counterRate);
-               QueryPerformanceCounter( (LARGE_INTEGER*)&baseCounter);
-       }
-       __int64 counterRate;            // LARGE_INTEGER type has no math functions so use int64
-       __int64 baseCounter;
-};
-static AppTime g_appTime;
-
-
-
-void CopyCStringToPascal( const char* src, unsigned char dst[256])
-{
-       int len = strlen( src);
-       dst[ 0] = len;
-       memcpy( dst + 1, src, len);
-}
-
-
-void CopyPascalStringToC( const unsigned char* src, char* dst)
-{
-       int len = src[ 0];
-       memcpy( dst, src + 1, len);
-       dst[ len] = 0;
-}
-
-
-AbsoluteTime UpTime()
-{
-       __int64 counter;
-       QueryPerformanceCounter( (LARGE_INTEGER*)&counter);
-
-       counter -= g_appTime.baseCounter;
-
-       AbsoluteTime time;
-       time.lo = (unsigned long)counter;
-       time.hi = (unsigned long)(counter >> 32);
-       return time;
-}
-
-
-Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b)
-{
-       __int64 value = a.hi;
-       value <<= 32;
-       value |= a.lo;
-       __int64 value2 = b.hi;
-       value2 <<= 32;
-       value2 |= b.lo;
-       value -= value2;
-
-       if (value <= 0)
-               return durationImmediate;
-
-       __int64 frac = value % g_appTime.counterRate;
-       value /= g_appTime.counterRate;
-
-       Duration time;
-
-       if (value == 0)
-       {
-               frac *= -1000000;
-               frac /= g_appTime.counterRate;
-               time = (Duration)frac;
-       }
-       else
-       {
-               frac *= 1000;
-               frac /= g_appTime.counterRate;
-               value *= 1000;
-               value += frac;
-               time = (Duration)value;
-       }
-
-       return time;
-}
-
-
-static char g_filename[ 256];
-char* ConvertFileName( const char* orgfilename)
-{
-       // translate filename into proper path name
-       if (orgfilename[ 0] == ':')
-               orgfilename++;
-       strcpy( g_filename, orgfilename);
-
-       for (int n = 0; g_filename[ n]; n++)
-       {
-               if (g_filename[ n] == ':')
-                       g_filename[ n] = '/';
-       }
-
-       return g_filename;
-}
diff --git a/Source/WinDefs.h b/Source/WinDefs.h
deleted file mode 100644 (file)
index 478c744..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef _WINDEFS_H_
-#define _WINDEFS_H_
-#ifdef WIN32
-
-
-#include <stdio.h>
-#include <float.h>
-
-// stuff to make Mac code compatable with Windows
-
-
-// disable warnings about double to float conversions
-#pragma warning(disable:4305)
-#pragma warning(disable:4244)
-
-// disable warnings about boolean to int conversions
-#pragma warning(disable:4800)
-
-// disable warning about unreferenced local variables
-#pragma warning(disable:4101)
-
-typedef bool Boolean;
-
-
-struct Point
-{
-       short v;
-       short h;
-};
-
-typedef signed char SInt8;
-typedef unsigned int UInt32;
-
-
-#include "Random.h"
-
-
-void CopyCStringToPascal( const char* src, unsigned char dst[256]);
-void CopyPascalStringToC( const unsigned char* src, char* dst);
-
-
-typedef struct AbsoluteTime
-{
-       unsigned long   hi;
-       unsigned long   lo;
-} AbsoluteTime; 
-
-AbsoluteTime UpTime();         // NOTE: returns time since app started, not system start
-
-typedef long Duration; 
-
-enum
-{
-       durationMicrosecond             = -1,
-       durationMillisecond             = 1,
-       durationSecond                  = 1000,
-       durationMinute                  = 1000 * 60,
-       durationHour                    = 1000 * 60 * 60,
-       durationDay                     = 1000 * 60 * 60 * 24,
-       durationForever                 = 0x7FFFFFFF,
-       durationImmediate               = 0,
-}; 
-
-Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b);
-
-
-inline bool isnormal( double x)
-{
-       int ret = _fpclass( x);
-       return (ret == _FPCLASS_NN || ret == _FPCLASS_PN);
-}
-
-typedef unsigned int uintptr_t;
-
-
-// fix file names to use '/' instead of ':'
-char* ConvertFileName( const char* orgfilename);
-
-#define fopen( a, b) fopen( ConvertFileName( a), b);
-/*
-inline float abs( float f)
-{
-if (f < 0)
-return -f;
-return f;
-}
-
-inline double abs( double f)
-{
-if (f < 0)
-return -f;
-return f;
-}
-*/
-inline long long abs( long long f)
-{
-       if (f < 0)
-               return -f;
-       return f;
-}
-#endif
-#endif
\ No newline at end of file
index 3728cf2247c93454d04073fbf6487992a200cdcf..c8880c72bfc585695cea1029cc3e0e876c8d4bb0 100644 (file)
@@ -4,7 +4,7 @@
 /**> HEADER FILES <**/
 #include <stdlib.h>
 #include <stdio.h>
 /**> HEADER FILES <**/
 #include <stdlib.h>
 #include <stdio.h>
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 
 /**> CONSTANT DECLARATIONS <**/
 // Mac Keyboard Codes
 
 /**> CONSTANT DECLARATIONS <**/
 // Mac Keyboard Codes
index 729ab2008f69a10108f7ac804010aa4f241f8a61..4d43dfe14306047196e8ca939dcdb7e615c63db9 100644 (file)
@@ -4,7 +4,7 @@
 #define _FMODWRAPPER_H_
 
 #include "fmod_header.h"
 #define _FMODWRAPPER_H_
 
 #include "fmod_header.h"
-#include "WinDefs.h"
+#include "MacCompatibility.h"
 
 
 #ifdef WIN32
 
 
 #ifdef WIN32
index bc36ba9ba99b8c7f2a2541316b765b51af81b3b8..6f130c112feae2e7e536c780b6e1c0cf3d70d363 100644 (file)
@@ -29,7 +29,7 @@
   #include <gl/glu.h>
   #include <gl/glaux.h>
   #include <gl/glext.h>
   #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) );
   #include "il/ilut.h"
 
   #define glDeleteTextures( a, b) glDeleteTextures( (a), (const unsigned int *)(b) );
index 34e3982cbfd53e0eccd995150290f36705c03ad3..e8bffd2e0a5322d1afea87a4d572b3a33e097e53 100644 (file)
--- a/makefile
+++ b/makefile
@@ -26,6 +26,8 @@ endif
 
 DEFINES := \
        -DPLATFORM_UNIX=1 \
 
 DEFINES := \
        -DPLATFORM_UNIX=1 \
+       -DPLATFORM_LINUX=1 \
+       -DUSE_SDL=1 \
 
 INCLUDES := \
                        -I./SDL12/include \
 
 INCLUDES := \
                        -I./SDL12/include \
@@ -73,9 +75,9 @@ SRCS := \
        unpack.c \
        unpack_private.c \
        Weapons.cpp \
        unpack.c \
        unpack_private.c \
        Weapons.cpp \
-       WinDefs.cpp \
+       MacCompatibility.cpp \
        WinInput.cpp \
        WinInput.cpp \
-       logger\logger.cpp \
+       logger/logger.cpp \
        Driver.cc \
        Md5.cc \
 
        Driver.cc \
        Md5.cc \