diff options
| author | ntoskrnl <ntoskrnl11@yahoo.com> | 2012-07-29 15:55:26 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-02 14:20:14 (GMT) |
| commit | 87dfc47c9785f834e61eef4545c503071d1665fc (patch) | |
| tree | 558c8c24c064a6f24cb5ee1fa0ab38e81e2aaadb /src | |
| parent | cbefea85d717bd599fa0559f091b051e904d9e2f (diff) | |
| download | powder-87dfc47c9785f834e61eef4545c503071d1665fc.zip powder-87dfc47c9785f834e61eef4545c503071d1665fc.tar.gz | |
Separate operating system and architecture preprocessor definitions
Conflicts:
SConscript
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config.h | 8 | ||||
| -rw-r--r-- | src/Misc.cpp | 17 | ||||
| -rw-r--r-- | src/PowderToySDL.cpp | 4 | ||||
| -rw-r--r-- | src/bson/BSON.h | 2 |
4 files changed, 14 insertions, 17 deletions
diff --git a/src/Config.h b/src/Config.h index ccca4b0..52e5ae8 100644 --- a/src/Config.h +++ b/src/Config.h @@ -48,11 +48,13 @@ #define IDENT_PLATFORM "WIN32" #elif defined(MACOSX) #define IDENT_PLATFORM "MACOSX" -#elif defined(LIN32) -#define IDENT_PLATFORM "LIN32" -#elif defined(LIN64) +#elif defined(LIN) +#if defined(_64BIT) #define IDENT_PLATFORM "LIN64" #else +#define IDENT_PLATFORM "LIN32" +#endif +#else #define IDENT_PLATFORM "UNKNOWN" #endif diff --git a/src/Misc.cpp b/src/Misc.cpp index 4451c4a..2c4f2e5 100644 --- a/src/Misc.cpp +++ b/src/Misc.cpp @@ -49,7 +49,7 @@ std::string URLEscape(std::string source) return finalString; } -#if defined(USE_SDL) && (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11) +#if defined(USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) #include <SDL/SDL_syswm.h> SDL_SysWMinfo sdl_wminfo; Atom XA_CLIPBOARD, XA_TARGETS; @@ -395,7 +395,7 @@ void clipboard_push_text(char * text) SetClipboardData(CF_TEXT, cbuffer); CloseClipboard(); } -#elif (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11) +#elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) if (clipboard_text!=NULL) { free(clipboard_text); clipboard_text = NULL; @@ -430,7 +430,7 @@ char * clipboard_pull_text() return ""; } } -#elif (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11) +#elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) printf("Not implemented: get text from clipboard\n"); #else printf("Not implemented: get text from clipboard\n"); @@ -554,7 +554,7 @@ int register_extension() if(currentfilename) free(currentfilename); return returnval; -#elif defined(LIN32) || defined(LIN64) +#elif defined(LIN) char *currentfilename = exe_name(); FILE *f; char *mimedata = @@ -663,17 +663,12 @@ 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) { #ifdef WIN32 ShellExecute(0, "OPEN", uri.c_str(), NULL, NULL, 0); -#elif MACOSX +#elif defined(MACOSX) char *cmd = (char*)malloc(7+uri.length()); strcpy(cmd, "open "); strappend(cmd, (char*)uri.c_str()); system(cmd); -#elif LIN32 - char *cmd = (char*)malloc(11+uri.length()); - strcpy(cmd, "xdg-open "); - strappend(cmd, (char*)uri.c_str()); - system(cmd); -#elif LIN64 +#elif defined(LIN) char *cmd = (char*)malloc(11+uri.length()); strcpy(cmd, "xdg-open "); strappend(cmd, (char*)uri.c_str()); diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index abfaaac..f9901c1 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -12,7 +12,7 @@ #include <string> #include "Config.h" #include "graphics/Graphics.h" -#if defined(LIN32) || defined(LIN64) +#if defined(LIN) #include "icon.h" #endif @@ -105,7 +105,7 @@ SDL_Surface * SDLOpen() HICON hIconBig = (HICON)LoadImage(reinterpret_cast<HMODULE>(&__ImageBase), MAKEINTRESOURCE(101), IMAGE_ICON, 32, 32, LR_SHARED); SendMessage(WindowHandle, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall); SendMessage(WindowHandle, WM_SETICON, ICON_BIG, (LPARAM)hIconBig); -#elif defined(LIN32) || defined(LIN32) +#elif defined(LIN) SDL_Surface *icon = SDL_CreateRGBSurfaceFrom(app_icon, 16, 16, 32, 64, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000); SDL_WM_SetIcon(icon, NULL); #endif diff --git a/src/bson/BSON.h b/src/bson/BSON.h index 960eea1..ff3aa8a 100644 --- a/src/bson/BSON.h +++ b/src/bson/BSON.h @@ -28,7 +28,7 @@ #include <stdarg.h> #include "Config.h" -#if defined(LIN64) || defined(LIN32) || defined(USE_STDINT) +#if defined(LIN) || defined(USE_STDINT) #include <sys/types.h> #include <stdint.h> #else |