--- /dev/null
+/**> 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;
+}
--- /dev/null
+#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
+
#include <fstream>
#include <iostream>
#include "gamegl.h"
-#include "WinDefs.h"
+#include "MacCompatibility.h"
#include <shellapi.h>
#include "fmod.h"
//#include <Carbon.h>
-#ifdef WIN32
-#include "WinDefs.h"
-#endif
+#include "MacCompatibility.h"
//------------------------------------------------------------------------//
// Misc. Constants
+++ /dev/null
-/**> 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;
-}
+++ /dev/null
-#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
/**> HEADER FILES <**/
#include <stdlib.h>
#include <stdio.h>
-#include "WinDefs.h"
+#include "MacCompatibility.h"
/**> CONSTANT DECLARATIONS <**/
// Mac Keyboard Codes
#define _FMODWRAPPER_H_
#include "fmod_header.h"
-#include "WinDefs.h"
+#include "MacCompatibility.h"
#ifdef WIN32
#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) );
DEFINES := \
-DPLATFORM_UNIX=1 \
+ -DPLATFORM_LINUX=1 \
+ -DUSE_SDL=1 \
INCLUDES := \
-I./SDL12/include \
unpack.c \
unpack_private.c \
Weapons.cpp \
- WinDefs.cpp \
+ MacCompatibility.cpp \
WinInput.cpp \
- logger\logger.cpp \
+ logger/logger.cpp \
Driver.cc \
Md5.cc \
projects / lugaru.git / commitdiff