diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:07:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:16:59 +0200 |
| commit | e103887c8c158e7059a586ef5a5f7b234c547dfe (patch) | |
| tree | 6cbcabd6d270e595578cc283afadd5b4023bd718 /scp2 | |
| parent | 4d23222b15ac0034e265441c71405a48403721f8 (diff) | |
QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.
Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 14 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 025ad7f5346a..b84ed29c681d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -504,7 +504,7 @@ File gid_Brand_File_Bin_Soffice #endif End -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 65a346f77469..9e29e0316163 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -498,7 +498,7 @@ End #endif #endif -#ifdef QUARTZ +#ifdef MACOSX File gid_File_Lib_Fps_Aqua LIB_FILE_BODY; Styles = (PACKED); @@ -898,7 +898,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) && ! defined(QUARTZ) && ! defined(LIBO_HEADLESS) +#if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS) File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); LIB_FILE_BODY; @@ -913,7 +913,7 @@ File gid_File_Lib_Vclplug_Gen End #endif -#if defined(UNX) && ! defined(QUARTZ) +#if defined(UNX) && ! defined(MACOSX) #ifdef ENABLE_GTK File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); @@ -962,7 +962,7 @@ End #endif #endif -#if defined(QUARTZ) +#if defined(MACOSX) File gid_File_Lib_AppleRemote Name = LIBNAME(AppleRemote); LIB_FILE_BODY; @@ -971,7 +971,7 @@ File gid_File_Lib_AppleRemote End #endif -#if defined(QUARTZ) +#if defined(MACOSX) File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); LIB_FILE_BODY; @@ -980,7 +980,7 @@ File gid_File_Lib_Basebmp End #endif -#if defined UNX && ! defined QUARTZ +#if defined UNX && ! defined MACOSX #if ! defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp ) #endif @@ -1136,7 +1136,7 @@ End STD_LIB_FILE( gid_File_Lib_Sot, sot ) -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa Name = LIBNAME(spa); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 68fe44839f37..a6a066ba86bb 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -148,7 +148,7 @@ End #endif -#if defined ENABLE_NPAPI_FROM_BROWSER && defined UNX && !defined QUARTZ +#if defined ENABLE_NPAPI_FROM_BROWSER && defined UNX && !defined MACOSX File gid_File_Bin_Pluginapp BIN_FILE_BODY; @@ -232,7 +232,7 @@ File gid_File_Bin_Senddoc #endif End -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 9a04b2ff102d..29559dc1e315 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -74,7 +74,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) STD_RES_FILE( gid_File_Res_Spa, spa ) |