steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: rework platform.hpp so that it is no longer necessary to pass -DFACTOR_64 and -DWINDOWS when compiling VM

db4
Slava Pestov 2010-01-13 23:06:45 +13:00
parent 47a5e96547
commit 2922e08ed9
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/Config.windows
View File

@ -1,4 +1,4 @@
CFLAGS += -DWINDOWS -mno-cygwin CFLAGS += -mno-cygwin
LIBS = -lm LIBS = -lm
PLAF_DLL_OBJS += vm/os-windows.o PLAF_DLL_OBJS += vm/os-windows.o
SHARED_FLAG = -shared SHARED_FLAG = -shared

2
vm/Config.x86.64
View File

@ -1 +1 @@
CFLAGS += -DFACTOR_64

1
vm/os-windows.hpp
View File

@ -18,7 +18,6 @@ typedef wchar_t vm_char;
#define STRCMP wcscmp #define STRCMP wcscmp
#define STRNCMP wcsncmp #define STRNCMP wcsncmp
#define STRDUP _wcsdup #define STRDUP _wcsdup
#define MIN(a,b) ((a)>(b)?(b):(a))
#define FTELL ftello64 #define FTELL ftello64
#define FSEEK fseeko64 #define FSEEK fseeko64

6
vm/platform.hpp
View File

@ -2,6 +2,7 @@
#define FACTOR_ARM #define FACTOR_ARM
#elif defined(__amd64__) || defined(__x86_64__) #elif defined(__amd64__) || defined(__x86_64__)
#define FACTOR_AMD64 #define FACTOR_AMD64
#define FACTOR_64
#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32) #elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32)
#define FACTOR_X86 #define FACTOR_X86
#elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC) #elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
@ -10,6 +11,10 @@
#error "Unsupported architecture" #error "Unsupported architecture"
#endif #endif
#ifdef WIN32
#define WINDOWS
#endif
#if defined(WINDOWS) #if defined(WINDOWS)
#if defined(WINCE) #if defined(WINCE)
#include "os-windows-ce.hpp" #include "os-windows-ce.hpp"
@ -18,6 +23,7 @@
#endif #endif
#include "os-windows.hpp" #include "os-windows.hpp"
#if defined(FACTOR_AMD64) #if defined(FACTOR_AMD64)
#include "os-windows-nt.64.hpp" #include "os-windows-nt.64.hpp"
#elif defined(FACTOR_X86) #elif defined(FACTOR_X86)