diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2009-11-19 22:17:28 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2009-11-19 22:17:28 +0300 |
| commit | da18c1f9f5a3d4dfddbf43aad4ff64464184c5b6 (patch) | |
| tree | 6b24607a59ed17df338b6e2082fcaa028771ebd5 /g15helper | |
| parent | b803a432751207b7b537ad39d1a4251bb2be2f2e (diff) | |
Make sure G15 works on OSX.
Diffstat (limited to 'g15helper')
| -rw-r--r-- | g15helper/g15helper.h | 6 | ||||
| -rw-r--r-- | g15helper/g15helper.pro | 4 | ||||
| -rw-r--r-- | g15helper/g15helper_macx.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/g15helper/g15helper.h b/g15helper/g15helper.h index cb1b6e763..67ad642f7 100644 --- a/g15helper/g15helper.h +++ b/g15helper/g15helper.h @@ -37,7 +37,11 @@ #define G15_MAX_BPP 1 #define G15_MAX_FBMEM (G15_MAX_WIDTH * G15_MAX_HEIGHT * G15_MAX_BPP) #define G15_MAX_FBMEM_BITS (G15_MAX_FBMEM / 8) -#define G15_WIDGET_NAME L"Mumble G15 Display" +#if defined(WIN32) + #define G15_WIDGET_NAME L"Mumble G15 Display" +#elif defined(APPLE) + #define G15_WIDGET_NAME CFSTR("Mumble G15 Display") +#endif enum { G15_ERR_INIT = 1, diff --git a/g15helper/g15helper.pro b/g15helper/g15helper.pro index 01f9702e1..0eeb2e937 100644 --- a/g15helper/g15helper.pro +++ b/g15helper/g15helper.pro @@ -15,6 +15,7 @@ win32 { LIBS *= -llgLcd -ladvapi32 -lshell32 -luser32 LIBPATH *= /dev/G15SDK/SDK/Libs/x86 INCLUDEPATH *= /dev/G15SDK/SDK/Src + DEFINES *= WIN32 } macx { @@ -24,6 +25,7 @@ macx { LIBPATH *= /opt/mumble-1.2/lglcd-sdk/SDK/lib/ INCLUDEPATH *= /opt/mumble-1.2/lglcd-sdk/SDK/Src/ QMAKE_LFLAGS *= -framework CoreFoundation -sectcreate __TEXT __info_plist g15helper.plist + DEFINES *= APPLE } CONFIG(release, debug|release) { @@ -31,6 +33,6 @@ CONFIG(release, debug|release) { } CONFIG(debug, debug|release) { - DEFINES += USE_LOGFILE + DEFINES *= USE_LOGFILE DESTDIR = ../debug/ } diff --git a/g15helper/g15helper_macx.c b/g15helper/g15helper_macx.c index fb236b7f8..a877d8fa3 100644 --- a/g15helper/g15helper_macx.c +++ b/g15helper/g15helper_macx.c @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { memset(&ctx, 0, sizeof(ctx)); memset(&bitmap, 0, sizeof(bitmap)); - conn.appFriendlyName = CFSTR(G15_WIDGET_NAME); + conn.appFriendlyName = G15_WIDGET_NAME; conn.isAutostartable = FALSE; conn.isPersistent = FALSE; conn.dwAppletCapabilitiesSupported =LGLCD_APPLET_CAP_BASIC | LGLCD_APPLET_CAP_BW; |