matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename WIN32 preprocessor definition to WIN

Browse Source
This commit is contained in:
ntoskrnl 2012-07-29 19:14:14 +03:00 committed by Simon Robertshaw
parent 87dfc47c97
commit f94fabd999
12 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SConscript
View File

@ -25,7 +25,7 @@ def SetupSpawn( env ):
AddOption('--opengl-renderer',dest="opengl-renderer",action='store_true',default=False,help="Build with OpenGL renderer support. (requires --opengl)") AddOption('--opengl-renderer',dest="opengl-renderer",action='store_true',default=False,help="Build with OpenGL renderer support. (requires --opengl)")
AddOption('--opengl',dest="opengl",action='store_true',default=False,help="Build with OpenGL interface support.") AddOption('--opengl',dest="opengl",action='store_true',default=False,help="Build with OpenGL interface support.")
AddOption('--win32',dest="win32",action='store_true',default=False,help="32bit Windows platform target.") AddOption('--win',dest="win",action='store_true',default=False,help="Windows platform target.")
AddOption('--lin',dest="lin",action='store_true',default=False,help="Linux platform target") AddOption('--lin',dest="lin",action='store_true',default=False,help="Linux platform target")
AddOption('--macosx',dest="macosx",action='store_true',default=False,help="Mac OS X platform target") AddOption('--macosx',dest="macosx",action='store_true',default=False,help="Mac OS X platform target")
AddOption('--64bit',dest="_64bit",action='store_true',default=False,help="64-bit platform target (Linux only at the moment)") AddOption('--64bit',dest="_64bit",action='store_true',default=False,help="64-bit platform target (Linux only at the moment)")
@ -47,11 +47,11 @@ AddOption('--minor-version',dest="minor-version",default=False,help="Minor versi
AddOption('--build-number',dest="build-number",default=False,help="Build number.") AddOption('--build-number',dest="build-number",default=False,help="Build number.")
AddOption('--snapshot',dest="snapshot",default=False,help="Snapshot build.") AddOption('--snapshot',dest="snapshot",default=False,help="Snapshot build.")
if((not GetOption('lin')) and (not GetOption('win32')) and (not GetOption('macosx'))): if((not GetOption('lin')) and (not GetOption('win')) and (not GetOption('macosx'))):
print "You must specify a platform to target" print "You must specify a platform to target"
raise SystemExit(1) raise SystemExit(1)
if(GetOption('win32')): if(GetOption('win')):
env = Environment(tools = ['mingw'], ENV = os.environ) env = Environment(tools = ['mingw'], ENV = os.environ)
else: else:
env = Environment(ENV = os.environ) env = Environment(ENV = os.environ)
@ -108,11 +108,11 @@ if GetOption("ptw32-static"):
if(GetOption('static')): if(GetOption('static')):
env.Append(LINKFLAGS=['-static-libgcc']) env.Append(LINKFLAGS=['-static-libgcc'])
if(GetOption('win32')): if(GetOption('win')):
openGLLibs = ['opengl32', 'glew32'] openGLLibs = ['opengl32', 'glew32']
env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'regex']) env.Prepend(LIBS=['mingw32', 'ws2_32', 'SDLmain', 'regex'])
env.Append(LIBS=['winmm', 'gdi32']) env.Append(LIBS=['winmm', 'gdi32'])
env.Append(CPPDEFINES=["WIN32"]) env.Append(CPPDEFINES=["WIN"])
env.Append(LINKFLAGS=['-mwindows']) env.Append(LINKFLAGS=['-mwindows'])
if(GetOption('lin'): if(GetOption('lin'):
openGLLibs = ['GL'] openGLLibs = ['GL']
@ -174,7 +174,7 @@ elif(GetOption('opengl-renderer')):
raise SystemExit(1) raise SystemExit(1)
sources=Glob("src/*.cpp") sources=Glob("src/*.cpp")
if(GetOption('win32')): if(GetOption('win')):
sources += env.RES('resources/powder-res.rc') sources += env.RES('resources/powder-res.rc')
sources+=Glob("src/*/*.cpp") sources+=Glob("src/*/*.cpp")
sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/elements/*.cpp")
@ -187,7 +187,7 @@ SetupSpawn(env)
programName = "powder" programName = "powder"
if(GetOption('win32')): if(GetOption('win')):
programName = "Powder" programName = "Powder"
if(GetOption('_64bit')): if(GetOption('_64bit')):
@ -199,7 +199,7 @@ if(not (GetOption('sse2') or GetOption('sse3'))):
if(GetOption('macosx')): if(GetOption('macosx')):
programName += "-x" programName += "-x"
if(GetOption('win32')): if(GetOption('win')):
programName += ".exe" programName += ".exe"
env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python generator.py elements $TARGETS $SOURCES") env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python generator.py elements $TARGETS $SOURCES")

10
src/Config.h
View File

@ -9,7 +9,7 @@
//#define CONFIG_H_ //#define CONFIG_H_
#ifdef WIN32 #ifdef WIN
#define PATH_SEP "\\" #define PATH_SEP "\\"
#else #else
#define PATH_SEP "/" #define PATH_SEP "/"
@ -44,7 +44,7 @@
#define IDENT_RELTYPE "R" #define IDENT_RELTYPE "R"
#endif #endif
#ifdef WIN32 #if defined(WIN)
#define IDENT_PLATFORM "WIN32" #define IDENT_PLATFORM "WIN32"
#elif defined(MACOSX) #elif defined(MACOSX)
#define IDENT_PLATFORM "MACOSX" #define IDENT_PLATFORM "MACOSX"
@ -173,17 +173,17 @@ extern unsigned char ZSIZE;
#define GLASS_IOR 1.9 #define GLASS_IOR 1.9
#define GLASS_DISP 0.07 #define GLASS_DISP 0.07
#ifdef WIN32 #ifdef WIN
#define strcasecmp stricmp #define strcasecmp stricmp
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN) && !defined(__GNUC__)
#define fmin min #define fmin min
#define fminf min #define fminf min
#define fmax max #define fmax max
#define fmaxf max #define fmaxf max
#endif #endif
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN) && !defined(__GNUC__)
#define TPT_INLINE _inline #define TPT_INLINE _inline
#else #else
#define TPT_INLINE inline #define TPT_INLINE inline

12
src/Misc.cpp
View File

@ -8,7 +8,7 @@
#include "Config.h" #include "Config.h"
#include "Misc.h" #include "Misc.h"
#include "icondoc.h" #include "icondoc.h"
#if defined WIN32 #if defined(WIN)
#include <shlobj.h> #include <shlobj.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <windows.h> #include <windows.h>
@ -59,7 +59,7 @@ char *clipboard_text = NULL;
char *exe_name(void) char *exe_name(void)
{ {
#if defined WIN32 #if defined(WIN)
char *name= (char *)malloc(64); char *name= (char *)malloc(64);
DWORD max=64, res; DWORD max=64, res;
while ((res = GetModuleFileName(NULL, name, max)) >= max) while ((res = GetModuleFileName(NULL, name, max)) >= max)
@ -378,7 +378,7 @@ void clipboard_push_text(char * text)
CFDataRef data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)text, strlen(text)); CFDataRef data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)text, strlen(text));
PasteboardPutItemFlavor(newclipboard, (PasteboardItemID)1, CFSTR("com.apple.traditional-mac-plain-text"), data, 0); PasteboardPutItemFlavor(newclipboard, (PasteboardItemID)1, CFSTR("com.apple.traditional-mac-plain-text"), data, 0);
#elif defined WIN32 #elif defined(WIN)
if (OpenClipboard(NULL)) if (OpenClipboard(NULL))
{ {
HGLOBAL cbuffer; HGLOBAL cbuffer;
@ -414,7 +414,7 @@ char * clipboard_pull_text()
{ {
#ifdef MACOSX #ifdef MACOSX
printf("Not implemented: get text from clipboard\n"); printf("Not implemented: get text from clipboard\n");
#elif defined WIN32 #elif defined(WIN)
if (OpenClipboard(NULL)) if (OpenClipboard(NULL))
{ {
HANDLE cbuffer; HANDLE cbuffer;
@ -440,7 +440,7 @@ char * clipboard_pull_text()
int register_extension() int register_extension()
{ {
#if defined WIN32 #if defined(WIN)
int returnval; int returnval;
LONG rresult; LONG rresult;
HKEY newkey; HKEY newkey;
@ -661,7 +661,7 @@ void HSV_to_RGB(int h,int s,int v,int *r,int *g,int *b)//convert 0-255(0-360 for
} }
void OpenURI(std::string uri) { void OpenURI(std::string uri) {
#ifdef WIN32 #if defined(WIN)
ShellExecute(0, "OPEN", uri.c_str(), NULL, NULL, 0); ShellExecute(0, "OPEN", uri.c_str(), NULL, NULL, 0);
#elif defined(MACOSX) #elif defined(MACOSX)
char *cmd = (char*)malloc(7+uri.length()); char *cmd = (char*)malloc(7+uri.length());

2
src/Misc.h
View File

@ -6,7 +6,7 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN) && !defined(__GNUC__)
#define x86_cpuid(func,af,bf,cf,df) \ #define x86_cpuid(func,af,bf,cf,df) \
do {\ do {\
__asm mov eax, func\ __asm mov eax, func\

11
src/PowderToySDL.cpp
View File

@ -4,7 +4,7 @@
#include <string> #include <string>
#include <time.h> #include <time.h>
#include "SDL.h" #include "SDL.h"
#ifdef WIN32 #ifdef WIN
#include "SDL_syswm.h" #include "SDL_syswm.h"
#endif #endif
#include <iostream> #include <iostream>
@ -35,7 +35,7 @@
using namespace std; using namespace std;
#ifdef WIN32 #ifdef WIN
extern "C" IMAGE_DOS_HEADER __ImageBase; extern "C" IMAGE_DOS_HEADER __ImageBase;
#endif #endif
@ -74,7 +74,7 @@ void blit(pixel * vid)
SDL_Surface * SDLOpen() SDL_Surface * SDLOpen()
{ {
SDL_Surface * surface; SDL_Surface * surface;
#if defined(WIN32) && defined(WINCONSOLE) #if defined(WIN) && defined(WINCONSOLE)
FILE * console = fopen("CON", "w" ); FILE * console = fopen("CON", "w" );
#endif #endif
if (SDL_Init(SDL_INIT_VIDEO)<0) if (SDL_Init(SDL_INIT_VIDEO)<0)
@ -83,17 +83,16 @@ SDL_Surface * SDLOpen()
return 0; return 0;
} }
SDL_EnableUNICODE(1); SDL_EnableUNICODE(1);
#if defined(WIN32) && defined(WINCONSOLE) #if defined(WIN) && defined(WINCONSOLE)
//On Windows, SDL redirects stdout to stdout.txt, which can be annoying when debugging, here we redirect back to the console //On Windows, SDL redirects stdout to stdout.txt, which can be annoying when debugging, here we redirect back to the console
if (console) if (console)
{ {
freopen("CON", "w", stdout); freopen("CON", "w", stdout);
freopen("CON", "w", stderr); freopen("CON", "w", stderr);
//fclose(console); //fclose(console);
} }
#endif #endif
#ifdef WIN32 #ifdef WIN
SDL_SysWMinfo SysInfo; SDL_SysWMinfo SysInfo;
SDL_VERSION(&SysInfo.version); SDL_VERSION(&SysInfo.version);
if(SDL_GetWMInfo(&SysInfo) <= 0) { if(SDL_GetWMInfo(&SysInfo) <= 0) {

14
src/Update.cpp
View File

@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef WIN32 #ifndef WIN
#include <sys/param.h> #include <sys/param.h>
#endif #endif
#if !defined(MACOSX) && !defined(BSD) #if !defined(MACOSX) && !defined(BSD)
@ -8,7 +8,7 @@
#endif #endif
#include <string.h> #include <string.h>
#ifdef WIN32 #ifdef WIN
#include <windows.h> #include <windows.h>
#else #else
#include <unistd.h> #include <unistd.h>
@ -24,7 +24,7 @@
/*char *exe_name(void) /*char *exe_name(void)
{ {
#if defined WIN32 #if defined(WIN)
char *name= (char *)malloc(64); char *name= (char *)malloc(64);
DWORD max=64, res; DWORD max=64, res;
while ((res = GetModuleFileName(NULL, name, max)) >= max) while ((res = GetModuleFileName(NULL, name, max)) >= max)
@ -69,7 +69,7 @@
int update_start(char *data, int len) int update_start(char *data, int len)
{ {
char *self=exe_name(), *temp; char *self=exe_name(), *temp;
#ifdef WIN32 #ifdef WIN
char *p; char *p;
#endif #endif
FILE *f; FILE *f;
@ -78,7 +78,7 @@ int update_start(char *data, int len)
if (!self) if (!self)
return 1; return 1;
#ifdef WIN32 #ifdef WIN
temp = (char*)malloc(strlen(self)+12); temp = (char*)malloc(strlen(self)+12);
strcpy(temp, self); strcpy(temp, self);
p = temp + strlen(temp) - 4; p = temp + strlen(temp) - 4;
@ -146,7 +146,7 @@ fail:
int update_finish(void) int update_finish(void)
{ {
#ifdef WIN32 #ifdef WIN
char *temp, *self=exe_name(), *p; char *temp, *self=exe_name(), *p;
int timeout = 60, err; int timeout = 60, err;
@ -181,7 +181,7 @@ int update_finish(void)
void update_cleanup(void) void update_cleanup(void)
{ {
#ifdef WIN32 #ifdef WIN
update_finish(); update_finish();
#endif #endif
} }

2
src/cat/LuaScriptInterface.cpp
View File

@ -1971,7 +1971,7 @@ int luatpt_getscript(lua_State* l)
filename = (char*)malloc(strlen(fileauthor)+strlen(fileid)+strlen(PATH_SEP)+strlen(LOCAL_LUA_DIR)+6); filename = (char*)malloc(strlen(fileauthor)+strlen(fileid)+strlen(PATH_SEP)+strlen(LOCAL_LUA_DIR)+6);
sprintf(filename, LOCAL_LUA_DIR PATH_SEP "%s_%s.lua", fileauthor, fileid); sprintf(filename, LOCAL_LUA_DIR PATH_SEP "%s_%s.lua", fileauthor, fileid);
#ifdef WIN32 #ifdef WIN
_mkdir(LOCAL_LUA_DIR); _mkdir(LOCAL_LUA_DIR);
#else #else
mkdir(LOCAL_LUA_DIR, 0755); mkdir(LOCAL_LUA_DIR, 0755);

10
src/client/Client.cpp
View File

@ -8,7 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include <deque> #include <deque>
#ifdef WIN32 #ifdef WIN
#include <direct.h> #include <direct.h>
#else #else
#include <sys/stat.h> #include <sys/stat.h>
@ -30,7 +30,7 @@
extern "C" extern "C"
{ {
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN) && !defined(__GNUC__)
#include <io.h> #include <io.h>
#else #else
#include <dirent.h> #include <dirent.h>
@ -136,7 +136,7 @@ std::vector<std::string> Client::DirectorySearch(std::string directory, std::str
{ {
//Get full file listing //Get full file listing
std::vector<std::string> directoryList; std::vector<std::string> directoryList;
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN) && !defined(__GNUC__)
//Windows //Windows
struct _finddata_t currentFile; struct _finddata_t currentFile;
intptr_t findFileHandle; intptr_t findFileHandle;
@ -591,7 +591,7 @@ string Client::AddStamp(GameSave * saveData)
<< std::setw(8) << std::setfill('0') << std::hex << lastStampTime << std::setw(8) << std::setfill('0') << std::hex << lastStampTime
<< std::setw(2) << std::setfill('0') << std::hex << lastStampName; << std::setw(2) << std::setfill('0') << std::hex << lastStampName;
#ifdef WIN32 #ifdef WIN
_mkdir(STAMPS_DIR); _mkdir(STAMPS_DIR);
#else #else
mkdir(STAMPS_DIR, 0755); mkdir(STAMPS_DIR, 0755);
@ -615,7 +615,7 @@ string Client::AddStamp(GameSave * saveData)
void Client::updateStamps() void Client::updateStamps()
{ {
#ifdef WIN32 #ifdef WIN
_mkdir(STAMPS_DIR); _mkdir(STAMPS_DIR);
#else #else
mkdir(STAMPS_DIR, 0755); mkdir(STAMPS_DIR, 0755);

18
src/client/HTTP.cpp
View File

@ -25,14 +25,14 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifndef WIN32 #ifndef WIN
#include <sys/param.h> #include <sys/param.h>
#endif #endif
#if !defined(MACOSX) && !defined(BSD) #if !defined(MACOSX) && !defined(BSD)
#include <malloc.h> #include <malloc.h>
#endif #endif
#include <time.h> #include <time.h>
#ifdef WIN32 #ifdef WIN
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
//#include <iphlpapi.h> //#include <iphlpapi.h>
#include <winsock2.h> #include <winsock2.h>
@ -52,7 +52,7 @@
#include "HTTP.h" #include "HTTP.h"
#include "MD5.h" #include "MD5.h"
#ifdef WIN32 #ifdef WIN
#define PERROR SOCKET_ERROR #define PERROR SOCKET_ERROR
#define PERRNO WSAGetLastError() #define PERRNO WSAGetLastError()
#define PEAGAIN WSAEWOULDBLOCK #define PEAGAIN WSAEWOULDBLOCK
@ -164,7 +164,7 @@ static int resolve(char *dns, char *srv, struct sockaddr_in *addr)
void http_init(char *proxy) void http_init(char *proxy)
{ {
char *host, *port; char *host, *port;
#ifdef WIN32 #ifdef WIN
WSADATA wsadata; WSADATA wsadata;
if (!WSAStartup(MAKEWORD(2,2), &wsadata)) if (!WSAStartup(MAKEWORD(2,2), &wsadata))
http_up = 1; http_up = 1;
@ -196,7 +196,7 @@ void http_init(char *proxy)
void http_done(void) void http_done(void)
{ {
#ifdef WIN32 #ifdef WIN
WSACleanup(); WSACleanup();
#endif #endif
http_up = 0; http_up = 0;
@ -413,7 +413,7 @@ int http_async_req_status(void *ctx)
char *dns,*srv,buf[CHUNK]; char *dns,*srv,buf[CHUNK];
int tmp, i; int tmp, i;
time_t now = time(NULL); time_t now = time(NULL);
#ifdef WIN32 #ifdef WIN
unsigned long tmp2; unsigned long tmp2;
#endif #endif
@ -445,7 +445,7 @@ int http_async_req_status(void *ctx)
if (cx->fd == PERROR) if (cx->fd == PERROR)
goto fail; goto fail;
cx->fdhost = mystrdup(cx->host); cx->fdhost = mystrdup(cx->host);
#ifdef WIN32 #ifdef WIN
tmp2 = 1; tmp2 = 1;
if (ioctlsocket(cx->fd, FIONBIO, &tmp2) == SOCKET_ERROR) if (ioctlsocket(cx->fd, FIONBIO, &tmp2) == SOCKET_ERROR)
goto fail; goto fail;
@ -459,7 +459,7 @@ int http_async_req_status(void *ctx)
} }
if (!connect(cx->fd, (struct sockaddr *)&cx->addr, sizeof(cx->addr))) if (!connect(cx->fd, (struct sockaddr *)&cx->addr, sizeof(cx->addr)))
cx->state = HTS_IDLE; cx->state = HTS_IDLE;
#ifdef WIN32 #ifdef WIN
else if (PERRNO==WSAEISCONN) else if (PERRNO==WSAEISCONN)
cx->state = HTS_IDLE; cx->state = HTS_IDLE;
#endif #endif
@ -468,7 +468,7 @@ int http_async_req_status(void *ctx)
cx->state = HTS_IDLE; cx->state = HTS_IDLE;
#endif #endif
else if (PERRNO!=PEINPROGRESS && PERRNO!=PEALREADY else if (PERRNO!=PEINPROGRESS && PERRNO!=PEALREADY
#ifdef WIN32 #ifdef WIN
&& PERRNO!=PEAGAIN && PERRNO!=WSAEINVAL && PERRNO!=PEAGAIN && PERRNO!=WSAEINVAL
#endif #endif
) )

2
src/graphics/OpenGLHeaders.h
View File

@ -10,7 +10,7 @@
#define GL_RGBA32F 0x8814 #define GL_RGBA32F 0x8814
#endif #endif
#elif defined(WIN32) #elif defined(WIN)
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/gl.h> #include <GL/gl.h>

2
src/powdertoyjava/OpenGLCanvasWin32.cpp
View File

@ -1,4 +1,4 @@
#if defined(USE_JNI) && defined(WIN32) #if defined(USE_JNI) && defined(WIN)
#include "OpenGLCanvasWin32.h" #include "OpenGLCanvasWin32.h"
static jfieldID ctxID = NULL; static jfieldID ctxID = NULL;

2
src/simulation/Simulation.cpp
View File

@ -3829,7 +3829,7 @@ killed:
if (!parts[i].vx&&!parts[i].vy)//if its not moving, skip to next particle, movement code it next if (!parts[i].vx&&!parts[i].vy)//if its not moving, skip to next particle, movement code it next
continue; continue;
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN) && !defined(__GNUC__)
mv = max(fabsf(parts[i].vx), fabsf(parts[i].vy)); mv = max(fabsf(parts[i].vx), fabsf(parts[i].vy));
#else #else
mv = fmaxf(fabsf(parts[i].vx), fabsf(parts[i].vy)); mv = fmaxf(fabsf(parts[i].vx), fabsf(parts[i].vy));