From 219bbc27f00d89ead6ec16403b878a4272dcbefd Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Tue, 16 Jan 2018 20:22:32 +1100 Subject: [PATCH] QB64_LINUX is now for linux exclusively --- internal/c/common.h | 2 +- internal/c/libqb.cpp | 20 ++++++++++---------- internal/c/os.h | 15 +++++++-------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/internal/c/common.h b/internal/c/common.h index d62128f88..4325fcbf9 100644 --- a/internal/c/common.h +++ b/internal/c/common.h @@ -22,7 +22,7 @@ #define QB64_GL1 #define QB64_GLUT -#ifdef QB64_LINUXONLY +#ifdef QB64_LINUX #define QB64_X11 #endif diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp index a85acee82..1b9444a2f 100644 --- a/internal/c/libqb.cpp +++ b/internal/c/libqb.cpp @@ -319,7 +319,7 @@ extern "C" int qb64_custom_event(int event,int v1,int v2,int v3,int v4,int v5,in extern "C" LRESULT qb64_os_event_windows(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, int *qb64_os_event_info); #endif -#if defined(QB64_LINUXONLY) && defined(QB64_GUI) +#if defined(QB64_LINUX) && defined(QB64_GUI) extern "C" void qb64_os_event_linux(XEvent *event, Display *display, int *qb64_os_event_info); #endif @@ -902,7 +902,7 @@ int64 orwl_gettime(void) { } #endif -#ifdef QB64_LINUXONLY +#ifdef QB64_LINUX int64 GetTicks(){ struct timespec tp; clock_gettime(CLOCK_MONOTONIC, &tp); @@ -14436,7 +14436,7 @@ int32 func__hasfocus() { #ifdef QB64_WINDOWS while (!window_handle){Sleep(100);} return -(window_handle==GetForegroundWindow()); - #elif defined(QB64_LINUXONLY) + #elif defined(QB64_LINUX) return window_focused; #endif #endif @@ -24227,7 +24227,7 @@ int32 func__exit(){ -#if defined(QB64_LINUXONLY) && defined(QB64_X11) +#if defined(QB64_LINUX) && defined(QB64_X11) //X11 clipboard interface for Linux //SDL_SysWMinfo syswminfo; @@ -24414,7 +24414,7 @@ if (x11selectionowner!=None){ return; #endif -#if defined(QB64_LINUXONLY) && defined(QB64_X11) +#if defined(QB64_LINUX) && defined(QB64_X11) static qbs *textz=NULL; if (!textz) textz=qbs_new(0,0); qbs_set(textz,qbs_add(text,qbs_new_txt_len("\0",1))); x11clipboardcopy((char*)textz->chr); @@ -24641,7 +24641,7 @@ return -1; return NULL; #endif -#if defined(QB64_LINUXONLY) && defined(QB64_X11) +#if defined(QB64_LINUX) && defined(QB64_X11) qbs *text; char *cp=x11clipboardpaste(); cp=x11clipboardpaste(); @@ -27590,7 +27590,7 @@ return -1; #else tqbs=qbs_new_txt("[WINDOWS][64BIT]"); #endif -#elif defined(QB64_LINUXONLY) +#elif defined(QB64_LINUX) #ifdef QB64_32 tqbs=qbs_new_txt("[LINUX][32BIT]"); #else @@ -29682,7 +29682,7 @@ qbs *func__dir(qbs* context_in){ extern void set_dynamic_info(); int main( int argc, char* argv[] ){ -#if defined(QB64_LINUXONLY) && defined(X11) +#if defined(QB64_LINUX) && defined(X11) XInitThreads(); #endif @@ -29961,7 +29961,7 @@ qbs_set(startDir,func__cwd()); } } chdir(exepath); -#elif defined(QB64_LINUXONLY) +#elif defined(QB64_LINUX) { char pathbuf[65536]; memset(pathbuf, 0, sizeof(pathbuf)); @@ -32746,7 +32746,7 @@ QB64_GAMEPAD_INIT(); } #endif -#if defined(QB64_LINUXONLY) && defined(QB64_GUI) +#if defined(QB64_LINUX) && defined(QB64_GUI) extern "C" void qb64_os_event_linux(XEvent *event, Display *display, int *qb64_os_event_info){ if (*qb64_os_event_info==OS_EVENT_PRE_PROCESSING){ diff --git a/internal/c/os.h b/internal/c/os.h index f747992a1..235e825fb 100644 --- a/internal/c/os.h +++ b/internal/c/os.h @@ -1,13 +1,14 @@ -/* Provide some OS/compiler macros. Note that a Mac has QB64_LINUX too +/* Provide some OS/compiler macros. * QB64_WINDOWS: Is this a Windows system? + * QB64_LINUX: Is this a Linux system? + * QB64_MACOSX: Is this MacOSX, or MacOS or whatever Apple calls it now? + * QB64_UNIX: Is this a Unix-flavoured system? + * * QB64_BACKSLASH_FILESYSTEM: Does this system use \ for file paths (as opposed to /)? * QB64_MICROSOFT: Are we compiling with Visual Studio? * QB64_GCC: Are we compiling with gcc? * QB64_MINGW: Are we compiling with MinGW, specifically? (Set in addition to QB64_GCC) - * QB64_LINUX: Is this a Unix system? - * QB64_UNIX: Alias of above - * QB64_LINUXONLY: Is this a Linux system? - * QB64_MACOSX: Is this MacOSX, or MacOS or whatever Apple calls it now? + * * QB64_32: A 32bit system (the default) * QB64_64: A 64bit system (assumes all Macs are 64 bit) */ @@ -23,11 +24,9 @@ #endif #elif defined(__APPLE__) #define QB64_MACOSX - #define QB64_LINUX #define QB64_UNIX #define QB64_GCC #elif defined(__linux__) - #define QB64_LINUXONLY #define QB64_LINUX #define QB64_UNIX #define QB64_GCC @@ -35,7 +34,7 @@ #error "Unknown system; refusing to build. Edit os.h if needed" #endif -#if _WIN64 || __x86_64__ || __ppc64__ || QB64_MACOSX +#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__) || defined(QB64_MACOSX) #define QB64_64 #else #define QB64_32