diff options
-rwxr-xr-x | Repository.mk | 2 | ||||
-rw-r--r-- | apple_remote/Module_apple_remote.mk | 2 | ||||
-rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
-rw-r--r-- | cairo/cairo/makefile.mk | 4 | ||||
-rw-r--r-- | cairo/pixman/makefile.mk | 4 | ||||
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.ac | 16 | ||||
-rw-r--r-- | desktop/Library_sofficeapp.mk | 4 | ||||
-rw-r--r-- | extensions/Library_pl.mk | 6 | ||||
-rw-r--r-- | extensions/Module_extensions.mk | 2 | ||||
-rw-r--r-- | fpicker/Module_fpicker.mk | 2 | ||||
-rw-r--r-- | lingucomponent/Module_lingucomponent.mk | 2 | ||||
-rw-r--r-- | np_sdk/StaticLibrary_nputils.mk | 2 | ||||
-rw-r--r-- | solenv/inc/lang.mk | 2 | ||||
-rw-r--r-- | toolkit/Library_tk.mk | 4 | ||||
-rw-r--r-- | vcl/Library_vcl.mk | 8 | ||||
-rw-r--r-- | vcl/Module_vcl.mk | 4 | ||||
-rw-r--r-- | writerfilter/qa/cppunittests/odiapi/makefile.mk | 4 |
18 files changed, 33 insertions, 38 deletions
diff --git a/Repository.mk b/Repository.mk index 5479d3674b66..5495aabaaaee 100755 --- a/Repository.mk +++ b/Repository.mk @@ -589,7 +589,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ vbaobj \ vbaswobj \ vclcanvas \ - $(if $(filter $(GUIBASE),aqua), \ + $(if $(filter $(OS),MACOSX), \ fps_aqua \ ) \ )) diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk index 4b0a691f6754..79e7b364906d 100644 --- a/apple_remote/Module_apple_remote.mk +++ b/apple_remote/Module_apple_remote.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,apple_remote)) -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,apple_remote,\ Library_AppleRemote \ Package_inc \ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 38beb8d131bd..2f03dd941017 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ )) endif -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) ifneq ($(CPUNAME),X86_64) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index e5d0b941900e..5e40c8cfd777 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -109,8 +109,8 @@ BUILD_DIR= OUT2INC+=src$/cairo-win32.h -.ELIF "$(GUIBASE)"=="aqua" -# ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.ELIF "$(OS)"=="MACOSX" +# ----------- Mac OS X -------------------------------- .IF "$(SYSBASE)"!="" .IF "$(EXTRA_CFLAGS)" != "" cairo_CFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 316d2d60af2f..10ba0f56789c 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -77,8 +77,8 @@ BUILD_DIR=pixman BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release .ENDIF -.ELIF "$(GUIBASE)"=="aqua" -# ----------- Native Mac OS X (Aqua/Quartz) -------------------------------- +.ELIF "$(OS)"=="MACOSX" +# ----------- Mac OS X -------------------------------- CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" diff --git a/config_host.mk.in b/config_host.mk.in index e6dddc5089a7..3c1d7c7f0036 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -217,7 +217,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export GUI=@GUI@ export GUIBASE=@GUIBASE@ -export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@ export GUI_FOR_BUILD=@GUI_FOR_BUILD@ export HAVE_CXX0X=@HAVE_CXX0X@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ diff --git a/configure.ac b/configure.ac index a2b1777cb550..db19ff412055 100644 --- a/configure.ac +++ b/configure.ac @@ -3480,7 +3480,7 @@ aix*) cygwin*) COM=MSC GUI=WNT - GUIBASE=WIN + GUIBASE=not-used OS=WNT RTL_OS=Windows P_SEP=";" @@ -3514,8 +3514,7 @@ cygwin*) darwin*) COM=GCC GUI=UNX - # Not sure if "Aqua" is the right term to use? - GUIBASE="aqua" + GUIBASE=not-used OS=MACOSX RTL_OS=MacOSX P_SEP=: @@ -3525,7 +3524,6 @@ darwin*) CPU=R CPUNAME=ARM RTL_ARCH=ARM_EABI - GUIBASE=cocoatouch PLATFORMID=macosx_arm_eabi OUTPATH=unxiosr OS=IOS @@ -3815,7 +3813,7 @@ linux-gnu*) linux-android*) COM=GCC GUI=UNX - GUIBASE=android + GUIBASE=not-used OS=ANDROID RTL_OS=Android P_SEP=: @@ -3854,7 +3852,7 @@ linux-android*) mingw*) COM=GCC GUI=WNT - GUIBASE=WIN + GUIBASE=not-used OS=WNT RTL_OS=Windows P_SEP=: @@ -4186,9 +4184,9 @@ if test "$cross_compiling" = "yes"; then test -f ./config_host.mk 2>/dev/null || exit cp config_host.mk ../config_build.mk cp config.log ../config.Build.log - . ./bin/get_config_variables COM GUI GUIBASE OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR + . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR - for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ + for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ PYTHON SYSTEM_LIBXSLT; do VV='$'$V VV=`eval "echo $VV"` @@ -4227,7 +4225,6 @@ else CPU_FOR_BUILD="$CPU" CXX_FOR_BUILD="$CXX" DISABLE_PYTHON_FOR_BUILD="$DISABLE_PYTHON" - GUIBASE_FOR_BUILD="$GUIBASE" GUI_FOR_BUILD="$GUI" INPATH_FOR_BUILD="$INPATH" MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="$MACOSX_DEPLOYMENT_TARGET" @@ -4239,7 +4236,6 @@ else fi AC_SUBST(COM_FOR_BUILD) AC_SUBST(GUI_FOR_BUILD) -AC_SUBST(GUIBASE_FOR_BUILD) AC_SUBST(OS_FOR_BUILD) AC_SUBST(CPU_FOR_BUILD) AC_SUBST(CPUNAME_FOR_BUILD) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 4a6fccf940ab..9f4b6da30bb1 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\ -DDESKTOP_DLLIMPLEMENTATION \ $(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \ $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \ - $(if $(filter aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \ + $(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \ $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ )) @@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),cocoatouch) +ifeq ($(OS),IOS) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ )) diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index e849cfd38558..a5b1f70a98cf 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -77,7 +77,7 @@ endif # GUI=WNT ifeq ($(GUI),UNX) -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,pl,\ extensions/source/plugin/aqua/macmgr \ @@ -90,7 +90,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,pl,\ CoreFoundation \ )) -else # GUIBASE!=aqua +else # OS!=MACOSX ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_Library_add_defs,pl,\ @@ -114,7 +114,7 @@ $(eval $(call gb_Library_add_libs,pl,\ -lX11 \ )) -endif # GUIBASE=aqua +endif # OS=MACOSX endif # GUI=UNX diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7bd6348ce797..4912721ea94a 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -110,7 +110,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) ifeq ($(GUI),UNX) -ifneq ($(GUIBASE),aqua) +ifneq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ StaticLibrary_plugcon \ Executable_pluginapp.bin \ diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk index 311af4ef5e9c..e31f8793f8b1 100644 --- a/fpicker/Module_fpicker.mk +++ b/fpicker/Module_fpicker.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,fpicker,\ Library_fps_office \ )) -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,fpicker,\ Library_fps_aqua \ )) diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk index 43f4a1a15a35..9f4fe2e21e43 100644 --- a/lingucomponent/Module_lingucomponent.mk +++ b/lingucomponent/Module_lingucomponent.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\ Library_guesslang \ Library_hyphen \ Library_lnth \ - $(if $(filter aqua,$(GUIBASE)),Library_MacOSXSpell) \ + $(if $(filter MACOSX,$(OS)),Library_MacOSXSpell) \ Library_spell \ Package_config \ StaticLibrary_ulingu \ diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index d9ff1aef77fd..264ea0382166 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -36,7 +36,7 @@ $(eval $(call gb_StaticLibrary_use_externals,nputils,\ npapi_headers \ )) -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_StaticLibrary_add_defs,nputils,\ -DNO_X11 \ )) diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk index df61d256f844..47671bf57b8e 100644 --- a/solenv/inc/lang.mk +++ b/solenv/inc/lang.mk @@ -17,7 +17,7 @@ # -#.IF "$(GUI)"=="UNX" || "$(GUIBASE)"=="WIN" +#.IF "$(GUI)"=="UNX" || "$(OS)"=="WNT" #LANG_GUI=WIN #.ELSE LANG_GUI=$(GUI) diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 7385829e8965..a7d562e58c00 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -127,13 +127,13 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/helper/vclunohelper \ )) -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_cxxflags,tk,\ $(gb_OBJCXXFLAGS) \ )) endif -ifeq ($(GUIBASE),cocoatouch) +ifeq ($(OS),IOS) $(eval $(call gb_Library_add_cxxflags,tk,\ $(gb_OBJCXXFLAGS))) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index af314880a29b..3550beb6c9bb 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -32,7 +32,7 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx)) else ifeq ($(OS),WNT) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows)) -else ifeq ($(GUIBASE),android) +else ifeq ($(OS),ANDROID) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android)) else ifeq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios)) @@ -324,7 +324,7 @@ $(eval $(call gb_Library_use_packages,vcl,\ # GUIBASE specific stuff -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ @@ -530,7 +530,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),android) +ifeq ($(OS),ANDROID) $(eval $(call gb_Library_add_libs,vcl,\ -llog \ -landroid \ @@ -561,7 +561,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),cocoatouch) +ifeq ($(OS),IOS) $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ )) diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 38c730db7cff..362acb3560c4 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -70,13 +70,13 @@ $(eval $(call gb_Module_add_targets,vcl,\ endif endif -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,vcl,\ Zip_osxres \ )) endif -ifeq ($(GUIBASE),WIN) +ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,vcl,\ WinResTarget_vcl \ )) diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk index 08e11c4dbee7..fd64fcae04d8 100644 --- a/writerfilter/qa/cppunittests/odiapi/makefile.mk +++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk @@ -38,9 +38,9 @@ SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS+= $(LB)$/iodiapi.lib -.ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"!="aqua" +.ELIF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX" SHL1STDLIBS+=$(LB)$/libodiapi.so -.ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"=="aqua" +.ELIF "$(OS)"=="MACOSX" SHL1STDLIBS+=$(LB)$/libodiapi.dylib .ENDIF |