From: Rejean Loyer Date: Thu, 21 Aug 2014 02:00:32 +0000 (-0400) Subject: buildsystem; makefiles; tarball: always use ifeq/ifneq (,) form instead of double... X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=commitdiff_plain;h=555e422cdb334d0067da47329e1a63c375607c7c buildsystem; makefiles; tarball: always use ifeq/ifneq (,) form instead of double quotes around the two parameters. --- diff --git a/Makefile b/Makefile index 56fd5e3..34afa63 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: all clean realclean distclean emptyoutput prepinstall actualinstall install copyonlyinstall uninstall troubleshoot outputdirs bootstrap deps ecere ecerecom ecerevanilla ear compiler prepbinaries epj2make ide documentor eda prepcodeguard codeguard fixprecompile cleantarget pots installer regenbootstrap updatebootstrap update_ecere update_libec update_ecp update_ecc update_ecs ecereaudio -ifneq "$(V)" "1" +ifneq ($(V),1) .SILENT: endif @@ -44,8 +44,8 @@ SOV := $(SO) ifndef DESTDIR -ifeq "$(TARGET_ARCH)" "x86_64" - ifneq "$(wildcard $(SystemDrive)/Program\ Files )" "" +ifeq ($(TARGET_ARCH),x86_64) + ifneq ($(wildcard $(SystemDrive)/Program\ Files ),) export DESTDIR=$(SystemDrive)/Program Files/Ecere SDK else export DESTDIR=$(SystemDrive)/Ecere SDK @@ -127,11 +127,11 @@ ifdef LIBDIR else export PREFIXLIBDIR=$(prefix)/lib/$(TARGET_ARCH) - ifeq "$(wildcard $(prefix)/lib/$(TARGET_ARCH) )" "" + ifeq ($(wildcard $(prefix)/lib/$(TARGET_ARCH) ),) export PREFIXLIBDIR=$(prefix)/lib - ifeq "$(TARGET_ARCH)" "i386-linux-gnu" - ifneq "$(wildcard $(prefix)/lib32 )" "" + ifeq ($(TARGET_ARCH),i386-linux-gnu) + ifneq ($(wildcard $(prefix)/lib32 ),) export PREFIXLIBDIR=$(prefix)/lib32 endif endif @@ -304,7 +304,7 @@ epj2make: prepbinaries cd epj2make && $(MAKE) ecereaudio: prepbinaries -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) @$(call echo,Building EcereAudio...) cd audio && $(MAKE) endif @@ -360,7 +360,7 @@ emptyoutput: outputdirs ifdef EDASQLiteCipher $(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO)) endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SO)) endif ifdef LINUX_TARGET @@ -372,7 +372,7 @@ ifdef LINUX_TARGET ifdef EDASQLiteCipher $(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO).0) endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SO).0) endif $(call rmq,$(SODESTDIR)$(LP)ecere$(SOV)) @@ -383,7 +383,7 @@ endif ifdef EDASQLiteCipher $(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SOV)) endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SOV)) endif endif @@ -407,7 +407,7 @@ cleantarget: cd epj2make && $(MAKE) cleantarget cd ide && $(MAKE) cleantarget cd installer && $(MAKE) cleantarget -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) cd audio && $(MAKE) cleantarget endif @@ -436,7 +436,7 @@ endif cd epj2make && $(MAKE) clean cd ide && $(MAKE) clean cd documentor && $(MAKE) clean -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) cd audio && $(MAKE) clean endif ifdef CodeGuard @@ -455,7 +455,7 @@ endif cd epj2make && $(MAKE) realclean cd ide && $(MAKE) realclean cd documentor && $(MAKE) realclean -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) cd audio && $(MAKE) realclan endif ifdef CodeGuard @@ -475,7 +475,7 @@ endif cd epj2make && $(MAKE) distclean cd ide && $(MAKE) distclean cd documentor && $(MAKE) distclean -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) cd audio && $(MAKE) distclean endif ifdef CodeGuard @@ -502,7 +502,7 @@ BINARIES = \ eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SOV) \ eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SOV) -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) BINARIES += audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV) endif @@ -526,7 +526,7 @@ ifdef WINDOWS_TARGET $(call cpq,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SO),$(OBJBINDIR)) $(call cpq,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SO),$(OBJBINDIR)) $(call cpq,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SO),$(OBJBINDIR)) -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJBINDIR)) endif ifdef EDASQLiteCipher @@ -540,7 +540,7 @@ ifdef LINUX_TARGET $(call cpq,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SOV),$(OBJLIBDIR)) $(call cpq,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SOV),$(OBJLIBDIR)) $(call cpq,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SOV),$(OBJLIBDIR)) -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV),$(OBJLIBDIR)) endif ifdef EDASQLiteCipher @@ -554,7 +554,7 @@ endif ifdef EDASQLiteCipher ln -sf $(LP)EDASQLiteCipher$(SOV) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO).0 endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) ln -sf $(LP)EcereAudio$(SOV) $(OBJLIBDIR)$(LP)EcereAudio$(SO).0 endif @@ -576,7 +576,7 @@ ifndef LINUX_TARGET $(call cpq,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SO),$(OBJLIBDIR)) $(call cpq,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SO),$(OBJLIBDIR)) $(call cpq,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SO),$(OBJLIBDIR)) -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJLIBDIR)) endif ifdef EDASQLiteCipher @@ -617,7 +617,7 @@ ifdef WINDOWS_TARGET ifdef EDASQLiteCipher $(call cpq,$(OBJBINDIR)$(LP)EDASQLiteCipher$(SO),"$(DESTLIBDIR)/") endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call cpq,$(OBJBINDIR)$(LP)EcereAudio$(SO),"$(DESTLIBDIR)/") endif $(call cpq,$(OBJBINDIR)ide$(E),"$(BINDIR)/") @@ -646,7 +646,7 @@ ifdef OSX_TARGET ifdef EDASQLiteCipher install $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO) $(DESTLIBDIR)/ endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) install $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/ endif install $(OBJBINDIR)ide$(E) $(BINDIR)/ @@ -686,7 +686,7 @@ ifdef LINUX_TARGET ifdef EDASQLiteCipher install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV) endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SOV) endif ln -sf $(LP)ecere$(SOV) $(DESTLIBDIR)/$(LP)ecere$(SO).0 @@ -697,7 +697,7 @@ endif ifdef EDASQLiteCipher ln -sf $(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO).0 endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) ln -sf $(LP)EcereAudio$(SOV) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO).0 endif ln -sf $(LP)ecere$(SOV) $(DESTLIBDIR)/$(LP)ecere$(SO) @@ -710,7 +710,7 @@ endif ifdef EDASQLiteCipher ln -sf $(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO) endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) ln -sf $(LP)EcereAudio$(SOV) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO) endif ifndef BSD_HOST @@ -783,7 +783,7 @@ ifdef LINUX_TARGET ifdef EDASQLiteCipher $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO)") endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO)") endif else @@ -791,7 +791,7 @@ else ifdef EDASQLiteCipher $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SO)") endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call rmq,"$(DESTLIBDIR)/$(LP)EcereAudio$(SO)") endif endif @@ -828,7 +828,7 @@ endif ifdef EDASQLiteCipher $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV)") endif -ifneq "$(ECERE_AUDIO)" "n" +ifneq ($(ECERE_AUDIO),n) $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereAudio$(SOV)") endif $(call rmq,"$(DESTDIR)$(prefix)/share/pixmaps/ecere.png") diff --git a/compiler/Makefile b/compiler/Makefile index 4e45b68..a87f751 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ .PHONY: all bootstrap cleantarget clean realclean distclean libec ecp ecc ecs -ifneq "$(V)" "1" +ifneq ($(V),1) .SILENT: endif diff --git a/compiler/bootstrap/Makefile b/compiler/bootstrap/Makefile index e9f341d..3b035ec 100644 --- a/compiler/bootstrap/Makefile +++ b/compiler/bootstrap/Makefile @@ -1,5 +1,5 @@ .PHONY: bindir ecere libec ecp ecc ecs cleantarget clean realclean distclean -ifneq "$(V)" "1" +ifneq ($(V),1) .SILENT: endif diff --git a/crossplatform.mk b/crossplatform.mk index 0e507a8..34132dd 100644 --- a/crossplatform.mk +++ b/crossplatform.mk @@ -1,18 +1,18 @@ # HOST PLATFORM DETECTION -ifeq "$(OS)" "Windows_NT" +ifeq ($(OS),Windows_NT) HOST_PLATFORM := win32 WINDOWS_HOST := defined else _UNAME := $(shell uname) UNAME_P := $(shell uname -p) - ifeq "$(_UNAME)" "FreeBSD" + ifeq ($(_UNAME),FreeBSD) # Using Linux platform for Unix OSes for now # HOST_PLATFORM := bsd BSD_HOST := defined HOST_PLATFORM := linux LINUX_HOST := defined else - ifeq "$(_UNAME)" "Darwin" + ifeq ($(_UNAME),Darwin) HOST_PLATFORM := apple OSX_HOST := defined else @@ -50,13 +50,13 @@ endif ifndef PLATFORM PLATFORM := $(TARGET_PLATFORM) endif -ifeq "$(TARGET_PLATFORM)" "win32" +ifeq ($(TARGET_PLATFORM),win32) WINDOWS_TARGET := defined else -ifeq "$(TARGET_PLATFORM)" "apple" +ifeq ($(TARGET_PLATFORM),apple) OSX_TARGET := defined else -#ifeq "$(TARGET_PLATFORM)" "bsd" +#ifeq ($(TARGET_PLATFORM),bsd) # BSD_TARGET := defined #else LINUX_TARGET := defined @@ -65,29 +65,29 @@ endif endif # CROSS_TARGET -ifneq "$(TARGET_PLATFORM)" "$(HOST_PLATFORM)" +ifneq ($(TARGET_PLATFORM),$(HOST_PLATFORM)) CROSS_TARGET := defined endif # TARGET_TYPE -ifeq "$(TARGET_TYPE)" "staticlib" +ifeq ($(TARGET_TYPE),staticlib) STATIC_LIBRARY_TARGET := defined else -ifeq "$(TARGET_TYPE)" "sharedlib" +ifeq ($(TARGET_TYPE),sharedlib) SHARED_LIBRARY_TARGET := defined else -ifeq "$(TARGET_TYPE)" "executable" +ifeq ($(TARGET_TYPE),executable) EXECUTABLE_TARGET := defined endif endif endif -ifeq "$(GCC_PREFIX)" "i586-mingw32msvc-" +ifeq ($(GCC_PREFIX),i586-mingw32msvc-) export ARCH ARCH := x32 endif -ifeq "$(GCC_PREFIX)" "i686-w64-mingw32-" +ifeq ($(GCC_PREFIX),i686-w64-mingw32-) export ARCH ARCH := x32 endif @@ -95,34 +95,34 @@ endif # Accept different things for ARCH but standardize on x32/x64 # This will be used for object directories ifdef ARCH - ifeq "$(ARCH)" "32" + ifeq ($(ARCH),32) override ARCH := x32 endif - ifeq "$(ARCH)" "x86" + ifeq ($(ARCH),x86) override ARCH := x32 endif - ifeq "$(ARCH)" "i386" + ifeq ($(ARCH),i386) override ARCH := x32 endif - ifeq "$(ARCH)" "i686" + ifeq ($(ARCH),i686) override ARCH := x32 endif - ifeq "$(ARCH)" "64" + ifeq ($(ARCH),64) override ARCH := x64 endif - ifeq "$(ARCH)" "amd64" + ifeq ($(ARCH),amd64) override ARCH := x64 endif - ifeq "$(ARCH)" "x86_64" + ifeq ($(ARCH),x86_64) override ARCH := x64 endif # Set ARCH_FLAGS only if ARCH is set - ifeq "$(ARCH)" "x64" + ifeq ($(ARCH),x64) TARGET_ARCH := x86_64 ARCH_FLAGS := -m64 endif - ifeq "$(ARCH)" "x32" + ifeq ($(ARCH),x32) TARGET_ARCH := i386 ARCH_FLAGS := -m32 endif @@ -138,8 +138,8 @@ endif # On Windows/32 bit systems, pass -m32 as TDM-GCC packaged with the installer produces 64 bit executables by default # Disable this if your compiler does not accept -m32 ifndef ARCH - ifeq "$(HOST_PLATFORM)" "win32" - ifeq "$(TARGET_PLATFORM)" "win32" + ifeq ($(HOST_PLATFORM),win32) + ifeq ($(TARGET_PLATFORM),win32) ifndef ProgramFiles(x86) ARCH := x32 TARGET_ARCH := i386 @@ -157,7 +157,7 @@ endif # COMPILER SUFFIX COMPILER_SUFFIX = $(ARCH_SUFFIX) ifdef COMPILER -ifneq "$(COMPILER)" "default" +ifneq ($(COMPILER),default) COMPILER_SUFFIX = .$(COMPILER)$(ARCH_SUFFIX) endif endif diff --git a/default.cf b/default.cf index 0e4121d..aa3d8aa 100644 --- a/default.cf +++ b/default.cf @@ -2,7 +2,7 @@ EC_BINS := $(_CF_DIR)$(if $(USE_BOOTSTRAP),compiler/bootstrap/obj/bin.$(HOST_PLA ifdef WINDOWS_HOST # Auto-Select MinGW-w64 when asking for 64 bit - ifeq "$(ARCH)" "x64" + ifeq ($(ARCH),x64) GCC_PREFIX=x86_64-w64-mingw32- endif endif @@ -24,10 +24,10 @@ export EAR := $(call sys_path,$(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$( ifdef WINDOWS_TARGET WINDRES := $(GCC_PREFIX)windres ifdef ARCH - ifeq "$(ARCH)" "x32" + ifeq ($(ARCH),x32) WINDRES_FLAGS := -F pe-i386 else - ifeq "$(ARCH)" "x64" + ifeq ($(ARCH),x64) WINDRES_FLAGS := -F pe-x86-64 endif endif diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile index 2a62506..17f007f 100644 --- a/deps/libffi-3.0.11/Makefile +++ b/deps/libffi-3.0.11/Makefile @@ -43,7 +43,7 @@ RES = TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)/$(LP)ffi$(A) -ifeq "$(TARGET_ARCH)" "x86_64" +ifeq ($(TARGET_ARCH),x86_64) PLATFORM_OBJ := win64 else PLATFORM_OBJ := win32 diff --git a/ear/Makefile b/ear/Makefile index b117442..44cc60e 100644 --- a/ear/Makefile +++ b/ear/Makefile @@ -1,4 +1,4 @@ -ifneq "$(V)" "1" +ifneq ($(V),1) .SILENT: endif .PHONY: all nores cleantarget clean realclean distclean diff --git a/ecere/Makefile b/ecere/Makefile index 71946e9..b56efde 100644 --- a/ecere/Makefile +++ b/ecere/Makefile @@ -727,22 +727,22 @@ $(OBJ)PNGFormat.sym: src/gfx/bitmaps/PNGFormat.ec $(OBJ)RGBFormat.sym: src/gfx/bitmaps/RGBFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/bitmaps/RGBFormat.ec -o $(OBJ)RGBFormat.sym -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Direct3D8DisplayDriver.sym: src/gfx/drivers/Direct3D8DisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Direct3D8DisplayDriver.ec -o $(OBJ)Direct3D8DisplayDriver.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Direct3D9DisplayDriver.sym: src/gfx/drivers/Direct3D9DisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Direct3D9DisplayDriver.ec -o $(OBJ)Direct3D9DisplayDriver.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)DirectDrawDisplayDriver.sym: src/gfx/drivers/DirectDrawDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/DirectDrawDisplayDriver.ec -o $(OBJ)DirectDrawDisplayDriver.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.sym: src/gfx/drivers/GDIDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/GDIDisplayDriver.ec -o $(OBJ)GDIDisplayDriver.sym endif @@ -756,7 +756,7 @@ $(OBJ)lfbConvert.sym: src/gfx/drivers/lfbConvert.ec $(OBJ)LFBDisplayDriver.sym: src/gfx/drivers/LFBDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/LFBDisplayDriver.ec -o $(OBJ)LFBDisplayDriver.sym -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.sym: src/gfx/drivers/NCursesDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.sym endif @@ -764,27 +764,27 @@ endif $(OBJ)OpenGLDisplayDriver.sym: src/gfx/drivers/OpenGLDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/OpenGLDisplayDriver.ec -o $(OBJ)OpenGLDisplayDriver.sym -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32BitmapPrinterDisplayDriver.sym: src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec -o $(OBJ)Win32BitmapPrinterDisplayDriver.sym endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaOpenGLDisplayDriver.sym: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/CocoaOpenGLDisplayDriver.ec -o $(OBJ)CocoaOpenGLDisplayDriver.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32ConsoleDisplayDriver.sym: src/gfx/drivers/Win32ConsoleDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Win32ConsoleDisplayDriver.ec -o $(OBJ)Win32ConsoleDisplayDriver.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32PrinterDisplayDriver.sym: src/gfx/drivers/Win32PrinterDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Win32PrinterDisplayDriver.ec -o $(OBJ)Win32PrinterDisplayDriver.sym endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.sym endif @@ -891,32 +891,32 @@ $(OBJ)ReplaceDialog.sym: src/gui/dialogs/ReplaceDialog.ec $(OBJ)WindowList.sym: src/gui/dialogs/WindowList.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/dialogs/WindowList.ec -o $(OBJ)WindowList.sym -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaDispatch.sym: src/gui/drivers/cocoa/CocoaDispatch.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/cocoa/CocoaDispatch.ec -o $(OBJ)CocoaDispatch.sym endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaInterface.sym: src/gui/drivers/cocoa/CocoaInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/cocoa/CocoaInterface.ec -o $(OBJ)CocoaInterface.sym endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.sym: src/gui/drivers/NCursesInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.sym: src/gui/drivers/Win32Interface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32ConsoleInterface.sym: src/gui/drivers/Win32ConsoleInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/Win32ConsoleInterface.ec -o $(OBJ)Win32ConsoleInterface.sym endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.sym: src/gui/drivers/XInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/XInterface.ec -o $(OBJ)XInterface.sym endif @@ -1142,22 +1142,22 @@ $(OBJ)PNGFormat.c: src/gfx/bitmaps/PNGFormat.ec $(OBJ)PNGFormat.sym | $(SYMBOLS) $(OBJ)RGBFormat.c: src/gfx/bitmaps/RGBFormat.ec $(OBJ)RGBFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/bitmaps/RGBFormat.ec -o $(OBJ)RGBFormat.c -symbols $(OBJ) -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Direct3D8DisplayDriver.c: src/gfx/drivers/Direct3D8DisplayDriver.ec $(OBJ)Direct3D8DisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Direct3D8DisplayDriver.ec -o $(OBJ)Direct3D8DisplayDriver.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Direct3D9DisplayDriver.c: src/gfx/drivers/Direct3D9DisplayDriver.ec $(OBJ)Direct3D9DisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Direct3D9DisplayDriver.ec -o $(OBJ)Direct3D9DisplayDriver.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)DirectDrawDisplayDriver.c: src/gfx/drivers/DirectDrawDisplayDriver.ec $(OBJ)DirectDrawDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/DirectDrawDisplayDriver.ec -o $(OBJ)DirectDrawDisplayDriver.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.c: src/gfx/drivers/GDIDisplayDriver.ec $(OBJ)GDIDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/GDIDisplayDriver.ec -o $(OBJ)GDIDisplayDriver.c -symbols $(OBJ) endif @@ -1171,7 +1171,7 @@ $(OBJ)lfbConvert.c: src/gfx/drivers/lfbConvert.ec $(OBJ)lfbConvert.sym | $(SYMBO $(OBJ)LFBDisplayDriver.c: src/gfx/drivers/LFBDisplayDriver.ec $(OBJ)LFBDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/LFBDisplayDriver.ec -o $(OBJ)LFBDisplayDriver.c -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.c: src/gfx/drivers/NCursesDisplayDriver.ec $(OBJ)NCursesDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.c -symbols $(OBJ) endif @@ -1179,27 +1179,27 @@ endif $(OBJ)OpenGLDisplayDriver.c: src/gfx/drivers/OpenGLDisplayDriver.ec $(OBJ)OpenGLDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/OpenGLDisplayDriver.ec -o $(OBJ)OpenGLDisplayDriver.c -symbols $(OBJ) -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32BitmapPrinterDisplayDriver.c: src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec $(OBJ)Win32BitmapPrinterDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec -o $(OBJ)Win32BitmapPrinterDisplayDriver.c -symbols $(OBJ) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaOpenGLDisplayDriver.c: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec $(OBJ)CocoaOpenGLDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/CocoaOpenGLDisplayDriver.ec -o $(OBJ)CocoaOpenGLDisplayDriver.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32ConsoleDisplayDriver.c: src/gfx/drivers/Win32ConsoleDisplayDriver.ec $(OBJ)Win32ConsoleDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Win32ConsoleDisplayDriver.ec -o $(OBJ)Win32ConsoleDisplayDriver.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32PrinterDisplayDriver.c: src/gfx/drivers/Win32PrinterDisplayDriver.ec $(OBJ)Win32PrinterDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/Win32PrinterDisplayDriver.ec -o $(OBJ)Win32PrinterDisplayDriver.c -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.c: src/gfx/drivers/XDisplayDriver.ec $(OBJ)XDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.c -symbols $(OBJ) endif @@ -1306,32 +1306,32 @@ $(OBJ)ReplaceDialog.c: src/gui/dialogs/ReplaceDialog.ec $(OBJ)ReplaceDialog.sym $(OBJ)WindowList.c: src/gui/dialogs/WindowList.ec $(OBJ)WindowList.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/dialogs/WindowList.ec -o $(OBJ)WindowList.c -symbols $(OBJ) -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaDispatch.c: src/gui/drivers/cocoa/CocoaDispatch.ec $(OBJ)CocoaDispatch.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/cocoa/CocoaDispatch.ec -o $(OBJ)CocoaDispatch.c -symbols $(OBJ) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaInterface.c: src/gui/drivers/cocoa/CocoaInterface.ec $(OBJ)CocoaInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/cocoa/CocoaInterface.ec -o $(OBJ)CocoaInterface.c -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.c: src/gui/drivers/NCursesInterface.ec $(OBJ)NCursesInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.c: src/gui/drivers/Win32Interface.ec $(OBJ)Win32Interface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32ConsoleInterface.c: src/gui/drivers/Win32ConsoleInterface.ec $(OBJ)Win32ConsoleInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/Win32ConsoleInterface.ec -o $(OBJ)Win32ConsoleInterface.c -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.c: src/gui/drivers/XInterface.ec $(OBJ)XInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/XInterface.ec -o $(OBJ)XInterface.c -symbols $(OBJ) endif @@ -1623,22 +1623,22 @@ $(OBJ)harfbuzz-impl.o: src/gfx/drivers/harfbuzz/harfbuzz-impl.c $(OBJ)harfbuzz-thai.o: src/gfx/drivers/harfbuzz/harfbuzz-thai.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-thai.c -o $(OBJ)harfbuzz-thai.o -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Direct3D8DisplayDriver.o: $(OBJ)Direct3D8DisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Direct3D8DisplayDriver.c -o $(OBJ)Direct3D8DisplayDriver.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Direct3D9DisplayDriver.o: $(OBJ)Direct3D9DisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Direct3D9DisplayDriver.c -o $(OBJ)Direct3D9DisplayDriver.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)DirectDrawDisplayDriver.o: $(OBJ)DirectDrawDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)DirectDrawDisplayDriver.c -o $(OBJ)DirectDrawDisplayDriver.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.o: $(OBJ)GDIDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)GDIDisplayDriver.c -o $(OBJ)GDIDisplayDriver.o endif @@ -1652,7 +1652,7 @@ $(OBJ)lfbConvert.o: $(OBJ)lfbConvert.c $(OBJ)LFBDisplayDriver.o: $(OBJ)LFBDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)LFBDisplayDriver.c -o $(OBJ)LFBDisplayDriver.o -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.o: $(OBJ)NCursesDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)NCursesDisplayDriver.c -o $(OBJ)NCursesDisplayDriver.o endif @@ -1660,27 +1660,27 @@ endif $(OBJ)OpenGLDisplayDriver.o: $(OBJ)OpenGLDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)OpenGLDisplayDriver.c -o $(OBJ)OpenGLDisplayDriver.o -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32BitmapPrinterDisplayDriver.o: $(OBJ)Win32BitmapPrinterDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Win32BitmapPrinterDisplayDriver.c -o $(OBJ)Win32BitmapPrinterDisplayDriver.o endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaOpenGLDisplayDriver.o: $(OBJ)CocoaOpenGLDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)CocoaOpenGLDisplayDriver.c -o $(OBJ)CocoaOpenGLDisplayDriver.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32ConsoleDisplayDriver.o: $(OBJ)Win32ConsoleDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Win32ConsoleDisplayDriver.c -o $(OBJ)Win32ConsoleDisplayDriver.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32PrinterDisplayDriver.o: $(OBJ)Win32PrinterDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Win32PrinterDisplayDriver.c -o $(OBJ)Win32PrinterDisplayDriver.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.o: $(OBJ)XDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)XDisplayDriver.c -o $(OBJ)XDisplayDriver.o endif @@ -1787,42 +1787,42 @@ $(OBJ)ReplaceDialog.o: $(OBJ)ReplaceDialog.c $(OBJ)WindowList.o: $(OBJ)WindowList.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)WindowList.c -o $(OBJ)WindowList.o -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaDispatch.o: $(OBJ)CocoaDispatch.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)CocoaDispatch.c -o $(OBJ)CocoaDispatch.o endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaEcereBridge.o: src/gui/drivers/cocoa/CocoaEcereBridge.m $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/cocoa/CocoaEcereBridge.m -o $(OBJ)CocoaEcereBridge.o endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaInterface.o: $(OBJ)CocoaInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)CocoaInterface.c -o $(OBJ)CocoaInterface.o endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)EcereView.o: src/gui/drivers/cocoa/EcereView.m $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/cocoa/EcereView.m -o $(OBJ)EcereView.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.o: $(OBJ)NCursesInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)NCursesInterface.c -o $(OBJ)NCursesInterface.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.o: $(OBJ)Win32Interface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Win32Interface.c -o $(OBJ)Win32Interface.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32ConsoleInterface.o: $(OBJ)Win32ConsoleInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Win32ConsoleInterface.c -o $(OBJ)Win32ConsoleInterface.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.o: $(OBJ)XInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)XInterface.c -o $(OBJ)XInterface.o endif diff --git a/ecere/Makefile.installer b/ecere/Makefile.installer index 613cdff..0708bbb 100644 --- a/ecere/Makefile.installer +++ b/ecere/Makefile.installer @@ -622,57 +622,57 @@ $(OBJ)i18n.sym: src/sys/i18n.ec $(OBJ)Condition.sym: src/sys/Condition.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/sys/Condition.ec) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Cube.sym: src/gfx/3D/meshes/Cube.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/meshes/Cube.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)SkyBox.sym: src/gfx/3D/meshes/SkyBox.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/meshes/SkyBox.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Sphere.sym: src/gfx/3D/meshes/Sphere.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/meshes/Sphere.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Object3DSFormat.sym: src/gfx/3D/models/Object3DSFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/models/Object3DSFormat.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Camera.sym: src/gfx/3D/Camera.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Camera.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Matrix.sym: src/gfx/3D/Matrix.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Matrix.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Mesh.sym: src/gfx/3D/Mesh.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Mesh.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Object.sym: src/gfx/3D/Object.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Object.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Plane.sym: src/gfx/3D/Plane.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Plane.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Quaternion.sym: src/gfx/3D/Quaternion.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Quaternion.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Vector3D.sym: src/gfx/3D/Vector3D.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Vector3D.ec) -o $(call quote_path,$@) endif @@ -680,12 +680,12 @@ endif $(OBJ)BMPFormat.sym: src/gfx/bitmaps/BMPFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/BMPFormat.ec) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)GIFFormat.sym: src/gfx/bitmaps/GIFFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/GIFFormat.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)JPEGFormat.sym: src/gfx/bitmaps/JPEGFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/JPEGFormat.ec) -o $(call quote_path,$@) endif @@ -696,12 +696,12 @@ $(OBJ)PCXFormat.sym: src/gfx/bitmaps/PCXFormat.ec $(OBJ)PNGFormat.sym: src/gfx/bitmaps/PNGFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/PNGFormat.ec) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)RGBFormat.sym: src/gfx/bitmaps/RGBFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/RGBFormat.ec) -o $(call quote_path,$@) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.sym: src/gfx/drivers/GDIDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/GDIDisplayDriver.ec) -o $(call quote_path,$@) endif @@ -715,17 +715,17 @@ $(OBJ)lfbConvert.sym: src/gfx/drivers/lfbConvert.ec $(OBJ)LFBDisplayDriver.sym: src/gfx/drivers/LFBDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/LFBDisplayDriver.ec) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.sym: src/gfx/drivers/NCursesDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/NCursesDisplayDriver.ec) -o $(call quote_path,$@) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaOpenGLDisplayDriver.sym: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/CocoaOpenGLDisplayDriver.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/XDisplayDriver.ec) -o $(call quote_path,$@) endif @@ -829,32 +829,32 @@ $(OBJ)ReplaceDialog.sym: src/gui/dialogs/ReplaceDialog.ec $(OBJ)WindowList.sym: src/gui/dialogs/WindowList.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/dialogs/WindowList.ec) -o $(call quote_path,$@) -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaDispatch.sym: src/gui/drivers/cocoa/CocoaDispatch.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/CocoaDispatch.ec) -o $(call quote_path,$@) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaInterface.sym: src/gui/drivers/cocoa/CocoaInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/CocoaInterface.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.sym: src/gui/drivers/NCursesInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/NCursesInterface.ec) -o $(call quote_path,$@) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.sym: src/gui/drivers/Win32Interface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/Win32Interface.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.sym: src/gui/drivers/XInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/XInterface.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)TVisionSkin.sym: src/gui/skins/TVisionSkin.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/skins/TVisionSkin.ec) -o $(call quote_path,$@) endif @@ -871,7 +871,7 @@ $(OBJ)ClipBoard.sym: src/gui/ClipBoard.ec $(OBJ)Cursor.sym: src/gui/Cursor.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/Cursor.ec) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Desktop3D.sym: src/gui/Desktop3D.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/Desktop3D.ec) -o $(call quote_path,$@) endif @@ -900,32 +900,32 @@ $(OBJ)typeEdit.sym: src/gui/typeEdit.ec $(OBJ)Window.sym: src/gui/Window.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/Window.ec) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)dcom.sym: src/net/dcom.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/dcom.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)HTTPFile.sym: src/net/HTTPFile.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/HTTPFile.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)network.sym: src/net/network.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/network.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NetworkClientFile.sym: src/net/NetworkClientFile.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/NetworkClientFile.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Service.sym: src/net/Service.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/Service.ec) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Socket.sym: src/net/Socket.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/Socket.ec) -o $(call quote_path,$@) endif @@ -1037,57 +1037,57 @@ $(OBJ)i18n.c: src/sys/i18n.ec $(OBJ)i18n.sym | $(SYMBOLS) $(OBJ)Condition.c: src/sys/Condition.ec $(OBJ)Condition.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/sys/Condition.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Cube.c: src/gfx/3D/meshes/Cube.ec $(OBJ)Cube.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/meshes/Cube.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)SkyBox.c: src/gfx/3D/meshes/SkyBox.ec $(OBJ)SkyBox.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/meshes/SkyBox.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Sphere.c: src/gfx/3D/meshes/Sphere.ec $(OBJ)Sphere.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/meshes/Sphere.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Object3DSFormat.c: src/gfx/3D/models/Object3DSFormat.ec $(OBJ)Object3DSFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/models/Object3DSFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Camera.c: src/gfx/3D/Camera.ec $(OBJ)Camera.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Camera.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Matrix.c: src/gfx/3D/Matrix.ec $(OBJ)Matrix.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Matrix.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Mesh.c: src/gfx/3D/Mesh.ec $(OBJ)Mesh.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Mesh.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Object.c: src/gfx/3D/Object.ec $(OBJ)Object.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Object.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Plane.c: src/gfx/3D/Plane.ec $(OBJ)Plane.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Plane.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Quaternion.c: src/gfx/3D/Quaternion.ec $(OBJ)Quaternion.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Quaternion.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Vector3D.c: src/gfx/3D/Vector3D.ec $(OBJ)Vector3D.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Vector3D.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1095,12 +1095,12 @@ endif $(OBJ)BMPFormat.c: src/gfx/bitmaps/BMPFormat.ec $(OBJ)BMPFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/BMPFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)GIFFormat.c: src/gfx/bitmaps/GIFFormat.ec $(OBJ)GIFFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/GIFFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)JPEGFormat.c: src/gfx/bitmaps/JPEGFormat.ec $(OBJ)JPEGFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/JPEGFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1111,12 +1111,12 @@ $(OBJ)PCXFormat.c: src/gfx/bitmaps/PCXFormat.ec $(OBJ)PCXFormat.sym | $(SYMBOLS) $(OBJ)PNGFormat.c: src/gfx/bitmaps/PNGFormat.ec $(OBJ)PNGFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/PNGFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)RGBFormat.c: src/gfx/bitmaps/RGBFormat.ec $(OBJ)RGBFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/RGBFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.c: src/gfx/drivers/GDIDisplayDriver.ec $(OBJ)GDIDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/GDIDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1130,17 +1130,17 @@ $(OBJ)lfbConvert.c: src/gfx/drivers/lfbConvert.ec $(OBJ)lfbConvert.sym | $(SYMBO $(OBJ)LFBDisplayDriver.c: src/gfx/drivers/LFBDisplayDriver.ec $(OBJ)LFBDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/LFBDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.c: src/gfx/drivers/NCursesDisplayDriver.ec $(OBJ)NCursesDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/NCursesDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaOpenGLDisplayDriver.c: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec $(OBJ)CocoaOpenGLDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/CocoaOpenGLDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.c: src/gfx/drivers/XDisplayDriver.ec $(OBJ)XDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/XDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1244,32 +1244,32 @@ $(OBJ)ReplaceDialog.c: src/gui/dialogs/ReplaceDialog.ec $(OBJ)ReplaceDialog.sym $(OBJ)WindowList.c: src/gui/dialogs/WindowList.ec $(OBJ)WindowList.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/dialogs/WindowList.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaDispatch.c: src/gui/drivers/cocoa/CocoaDispatch.ec $(OBJ)CocoaDispatch.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/cocoa/CocoaDispatch.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaInterface.c: src/gui/drivers/cocoa/CocoaInterface.ec $(OBJ)CocoaInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/cocoa/CocoaInterface.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.c: src/gui/drivers/NCursesInterface.ec $(OBJ)NCursesInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/NCursesInterface.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.c: src/gui/drivers/Win32Interface.ec $(OBJ)Win32Interface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/Win32Interface.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.c: src/gui/drivers/XInterface.ec $(OBJ)XInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/XInterface.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)TVisionSkin.c: src/gui/skins/TVisionSkin.ec $(OBJ)TVisionSkin.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/skins/TVisionSkin.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1286,7 +1286,7 @@ $(OBJ)ClipBoard.c: src/gui/ClipBoard.ec $(OBJ)ClipBoard.sym | $(SYMBOLS) $(OBJ)Cursor.c: src/gui/Cursor.ec $(OBJ)Cursor.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/Cursor.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Desktop3D.c: src/gui/Desktop3D.ec $(OBJ)Desktop3D.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/Desktop3D.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1315,32 +1315,32 @@ $(OBJ)typeEdit.c: src/gui/typeEdit.ec $(OBJ)typeEdit.sym | $(SYMBOLS) $(OBJ)Window.c: src/gui/Window.ec $(OBJ)Window.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/Window.ec) -o $(call quote_path,$@) -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)dcom.c: src/net/dcom.ec $(OBJ)dcom.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/dcom.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)HTTPFile.c: src/net/HTTPFile.ec $(OBJ)HTTPFile.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/HTTPFile.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)network.c: src/net/network.ec $(OBJ)network.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/network.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NetworkClientFile.c: src/net/NetworkClientFile.ec $(OBJ)NetworkClientFile.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/NetworkClientFile.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Service.c: src/net/Service.ec $(OBJ)Service.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/Service.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Socket.c: src/net/Socket.ec $(OBJ)Socket.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/Socket.ec) -o $(call quote_path,$@) -symbols $(OBJ) endif @@ -1461,57 +1461,57 @@ $(OBJ)i18n.o: $(OBJ)i18n.c $(OBJ)Condition.o: $(OBJ)Condition.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Condition.c) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Cube.o: $(OBJ)Cube.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Cube.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)SkyBox.o: $(OBJ)SkyBox.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)SkyBox.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Sphere.o: $(OBJ)Sphere.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Sphere.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Object3DSFormat.o: $(OBJ)Object3DSFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Object3DSFormat.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Camera.o: $(OBJ)Camera.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Camera.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Matrix.o: $(OBJ)Matrix.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Matrix.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Mesh.o: $(OBJ)Mesh.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Mesh.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Object.o: $(OBJ)Object.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Object.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Plane.o: $(OBJ)Plane.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Plane.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Quaternion.o: $(OBJ)Quaternion.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Quaternion.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Vector3D.o: $(OBJ)Vector3D.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Vector3D.c) -o $(call quote_path,$@) endif @@ -1519,12 +1519,12 @@ endif $(OBJ)BMPFormat.o: $(OBJ)BMPFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)BMPFormat.c) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)GIFFormat.o: $(OBJ)GIFFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)GIFFormat.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)JPEGFormat.o: $(OBJ)JPEGFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)JPEGFormat.c) -o $(call quote_path,$@) endif @@ -1535,12 +1535,12 @@ $(OBJ)PCXFormat.o: $(OBJ)PCXFormat.c $(OBJ)PNGFormat.o: $(OBJ)PNGFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)PNGFormat.c) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)RGBFormat.o: $(OBJ)RGBFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)RGBFormat.c) -o $(call quote_path,$@) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.o: $(OBJ)GDIDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)GDIDisplayDriver.c) -o $(call quote_path,$@) endif @@ -1554,17 +1554,17 @@ $(OBJ)lfbConvert.o: $(OBJ)lfbConvert.c $(OBJ)LFBDisplayDriver.o: $(OBJ)LFBDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)LFBDisplayDriver.c) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.o: $(OBJ)NCursesDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)NCursesDisplayDriver.c) -o $(call quote_path,$@) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaOpenGLDisplayDriver.o: $(OBJ)CocoaOpenGLDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)CocoaOpenGLDisplayDriver.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.o: $(OBJ)XDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)XDisplayDriver.c) -o $(call quote_path,$@) endif @@ -1668,42 +1668,42 @@ $(OBJ)ReplaceDialog.o: $(OBJ)ReplaceDialog.c $(OBJ)WindowList.o: $(OBJ)WindowList.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)WindowList.c) -o $(call quote_path,$@) -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaDispatch.o: $(OBJ)CocoaDispatch.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)CocoaDispatch.c) -o $(call quote_path,$@) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaEcereBridge.o: src/gui/drivers/cocoa/CocoaEcereBridge.m $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/CocoaEcereBridge.m) -o $(call quote_path,$@) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)CocoaInterface.o: $(OBJ)CocoaInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)CocoaInterface.c) -o $(call quote_path,$@) endif -ifneq "$(OSX_TARGET)" "" +ifneq ($(OSX_TARGET),) $(OBJ)EcereView.o: src/gui/drivers/cocoa/EcereView.m $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/EcereView.m) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.o: $(OBJ)NCursesInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)NCursesInterface.c) -o $(call quote_path,$@) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.o: $(OBJ)Win32Interface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Win32Interface.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.o: $(OBJ)XInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)XInterface.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)TVisionSkin.o: $(OBJ)TVisionSkin.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)TVisionSkin.c) -o $(call quote_path,$@) endif @@ -1720,7 +1720,7 @@ $(OBJ)ClipBoard.o: $(OBJ)ClipBoard.c $(OBJ)Cursor.o: $(OBJ)Cursor.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Cursor.c) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Desktop3D.o: $(OBJ)Desktop3D.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Desktop3D.c) -o $(call quote_path,$@) endif @@ -1749,32 +1749,32 @@ $(OBJ)typeEdit.o: $(OBJ)typeEdit.c $(OBJ)Window.o: $(OBJ)Window.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Window.c) -o $(call quote_path,$@) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)dcom.o: $(OBJ)dcom.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)dcom.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)HTTPFile.o: $(OBJ)HTTPFile.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)HTTPFile.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)network.o: $(OBJ)network.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)network.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NetworkClientFile.o: $(OBJ)NetworkClientFile.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)NetworkClientFile.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Service.o: $(OBJ)Service.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Service.c) -o $(call quote_path,$@) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)Socket.o: $(OBJ)Socket.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Socket.c) -o $(call quote_path,$@) endif diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla index b6aeadd..dc1c753 100644 --- a/ecere/Makefile.vanilla +++ b/ecere/Makefile.vanilla @@ -563,7 +563,7 @@ $(OBJ)Condition.sym: src/sys/Condition.ec $(OBJ)BMPFormat.sym: src/gfx/bitmaps/BMPFormat.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/bitmaps/BMPFormat.ec -o $(OBJ)BMPFormat.sym -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.sym: src/gfx/drivers/GDIDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/GDIDisplayDriver.ec -o $(OBJ)GDIDisplayDriver.sym endif @@ -577,12 +577,12 @@ $(OBJ)lfbConvert.sym: src/gfx/drivers/lfbConvert.ec $(OBJ)LFBDisplayDriver.sym: src/gfx/drivers/LFBDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/LFBDisplayDriver.ec -o $(OBJ)LFBDisplayDriver.sym -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.sym: src/gfx/drivers/NCursesDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.sym endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.sym endif @@ -680,17 +680,17 @@ $(OBJ)ReplaceDialog.sym: src/gui/dialogs/ReplaceDialog.ec $(OBJ)WindowList.sym: src/gui/dialogs/WindowList.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/dialogs/WindowList.ec -o $(OBJ)WindowList.sym -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.sym: src/gui/drivers/NCursesInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.sym endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.sym: src/gui/drivers/Win32Interface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.sym endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.sym: src/gui/drivers/XInterface.ec $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gui/drivers/XInterface.ec -o $(OBJ)XInterface.sym endif @@ -841,7 +841,7 @@ $(OBJ)Condition.c: src/sys/Condition.ec $(OBJ)Condition.sym | $(SYMBOLS) $(OBJ)BMPFormat.c: src/gfx/bitmaps/BMPFormat.ec $(OBJ)BMPFormat.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gfx/bitmaps/BMPFormat.ec -o $(OBJ)BMPFormat.c -symbols $(OBJ) -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.c: src/gfx/drivers/GDIDisplayDriver.ec $(OBJ)GDIDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/GDIDisplayDriver.ec -o $(OBJ)GDIDisplayDriver.c -symbols $(OBJ) endif @@ -855,12 +855,12 @@ $(OBJ)lfbConvert.c: src/gfx/drivers/lfbConvert.ec $(OBJ)lfbConvert.sym | $(SYMBO $(OBJ)LFBDisplayDriver.c: src/gfx/drivers/LFBDisplayDriver.ec $(OBJ)LFBDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/LFBDisplayDriver.ec -o $(OBJ)LFBDisplayDriver.c -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.c: src/gfx/drivers/NCursesDisplayDriver.ec $(OBJ)NCursesDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.c -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.c: src/gfx/drivers/XDisplayDriver.ec $(OBJ)XDisplayDriver.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.c -symbols $(OBJ) endif @@ -958,17 +958,17 @@ $(OBJ)ReplaceDialog.c: src/gui/dialogs/ReplaceDialog.ec $(OBJ)ReplaceDialog.sym $(OBJ)WindowList.c: src/gui/dialogs/WindowList.ec $(OBJ)WindowList.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gui/dialogs/WindowList.ec -o $(OBJ)WindowList.c -symbols $(OBJ) -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.c: src/gui/drivers/NCursesInterface.ec $(OBJ)NCursesInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.c -symbols $(OBJ) endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.c: src/gui/drivers/Win32Interface.ec $(OBJ)Win32Interface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.c -symbols $(OBJ) endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.c: src/gui/drivers/XInterface.ec $(OBJ)XInterface.sym | $(SYMBOLS) $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c src/gui/drivers/XInterface.ec -o $(OBJ)XInterface.c -symbols $(OBJ) endif @@ -1128,102 +1128,102 @@ $(OBJ)Condition.o: $(OBJ)Condition.c $(OBJ)BMPFormat.o: $(OBJ)BMPFormat.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)BMPFormat.c -o $(OBJ)BMPFormat.o -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-freetype.o: src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c -o $(OBJ)harfbuzz-freetype.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-unicode-tables.o: src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c -o $(OBJ)harfbuzz-unicode-tables.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-unicode.o: src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c -o $(OBJ)harfbuzz-unicode.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-arabic.o: src/gfx/drivers/harfbuzz/harfbuzz-arabic.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-arabic.c -o $(OBJ)harfbuzz-arabic.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-buffer.o: src/gfx/drivers/harfbuzz/harfbuzz-buffer.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-buffer.c -o $(OBJ)harfbuzz-buffer.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-gdef.o: src/gfx/drivers/harfbuzz/harfbuzz-gdef.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-gdef.c -o $(OBJ)harfbuzz-gdef.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-gpos.o: src/gfx/drivers/harfbuzz/harfbuzz-gpos.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-gpos.c -o $(OBJ)harfbuzz-gpos.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-gsub.o: src/gfx/drivers/harfbuzz/harfbuzz-gsub.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-gsub.c -o $(OBJ)harfbuzz-gsub.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-hangul.o: src/gfx/drivers/harfbuzz/harfbuzz-hangul.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-hangul.c -o $(OBJ)harfbuzz-hangul.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-hebrew.o: src/gfx/drivers/harfbuzz/harfbuzz-hebrew.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-hebrew.c -o $(OBJ)harfbuzz-hebrew.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-indic.o: src/gfx/drivers/harfbuzz/harfbuzz-indic.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-indic.c -o $(OBJ)harfbuzz-indic.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-khmer.o: src/gfx/drivers/harfbuzz/harfbuzz-khmer.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-khmer.c -o $(OBJ)harfbuzz-khmer.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-myanmar.o: src/gfx/drivers/harfbuzz/harfbuzz-myanmar.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-myanmar.c -o $(OBJ)harfbuzz-myanmar.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-open.o: src/gfx/drivers/harfbuzz/harfbuzz-open.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-open.c -o $(OBJ)harfbuzz-open.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-shaper.o: src/gfx/drivers/harfbuzz/harfbuzz-shaper.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-shaper.c -o $(OBJ)harfbuzz-shaper.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-stream.o: src/gfx/drivers/harfbuzz/harfbuzz-stream.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-stream.c -o $(OBJ)harfbuzz-stream.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-tibetan.o: src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c -o $(OBJ)harfbuzz-tibetan.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-impl.o: src/gfx/drivers/harfbuzz/harfbuzz-impl.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-impl.c -o $(OBJ)harfbuzz-impl.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)harfbuzz-thai.o: src/gfx/drivers/harfbuzz/harfbuzz-thai.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-thai.c -o $(OBJ)harfbuzz-thai.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)GDIDisplayDriver.o: $(OBJ)GDIDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)GDIDisplayDriver.c -o $(OBJ)GDIDisplayDriver.o endif @@ -1237,12 +1237,12 @@ $(OBJ)lfbConvert.o: $(OBJ)lfbConvert.c $(OBJ)LFBDisplayDriver.o: $(OBJ)LFBDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)LFBDisplayDriver.c -o $(OBJ)LFBDisplayDriver.o -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesDisplayDriver.o: $(OBJ)NCursesDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)NCursesDisplayDriver.c -o $(OBJ)NCursesDisplayDriver.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XDisplayDriver.o: $(OBJ)XDisplayDriver.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)XDisplayDriver.c -o $(OBJ)XDisplayDriver.o endif @@ -1340,17 +1340,17 @@ $(OBJ)ReplaceDialog.o: $(OBJ)ReplaceDialog.c $(OBJ)WindowList.o: $(OBJ)WindowList.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)WindowList.c -o $(OBJ)WindowList.o -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)NCursesInterface.o: $(OBJ)NCursesInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)NCursesInterface.c -o $(OBJ)NCursesInterface.o endif -ifneq "$(WINDOWS_TARGET)" "" +ifneq ($(WINDOWS_TARGET),) $(OBJ)Win32Interface.o: $(OBJ)Win32Interface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)Win32Interface.c -o $(OBJ)Win32Interface.o endif -ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" "" +ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),) $(OBJ)XInterface.o: $(OBJ)XInterface.c $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)XInterface.c -o $(OBJ)XInterface.o endif diff --git a/eda/Makefile b/eda/Makefile index 3a0861a..be9ebbb 100644 --- a/eda/Makefile +++ b/eda/Makefile @@ -1,4 +1,4 @@ -ifneq "$(V)" "1" +ifneq ($(V),1) .SILENT: endif .PHONY: all cmd cleantarget clean realclean distclean diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec index fb1e8fc..a7ebc95 100644 --- a/ide/src/project/Project.ec +++ b/ide/src/project/Project.ec @@ -2561,10 +2561,10 @@ private: f.Puts("ifdef WINDOWS_TARGET\n"); f.Puts("WINDRES := $(GCC_PREFIX)windres\n"); f.Puts(" ifdef ARCH\n"); - f.Puts(" ifeq \"$(ARCH)\" \"x32\"\n"); + f.Puts(" ifeq ($(ARCH),x32)\n"); f.Puts("WINDRES_FLAGS := -F pe-i386\n"); f.Puts(" else\n"); - f.Puts(" ifeq \"$(ARCH)\" \"x64\"\n"); + f.Puts(" ifeq ($(ARCH),x64)\n"); f.Puts("WINDRES_FLAGS := -F pe-x86-64\n"); f.Puts(" endif\n"); f.Puts(" endif\n"); @@ -2858,7 +2858,7 @@ private: if(ifCount) f.Puts("else\n"); ifCount++; - f.Printf("ifeq \"$(TARGET_TYPE)\" \"%s\"\n", TargetTypeToMakefileVariable(type)); + f.Printf("ifeq ($(TARGET_TYPE),%s)\n", TargetTypeToMakefileVariable(type)); GetMakefileTargetFileName(type, target, config); strcpy(temp, targetDir); @@ -3383,7 +3383,7 @@ private: f.Puts("\t$(UPX) $(UPXFLAGS) $(TARGET)\n"); f.Puts("endif\n"); f.Puts("else\n"); - //f.Puts("ifneq \"$(TARGET_ARCH)\" \"x86_64\"\n"); + //f.Puts("ifneq ($(TARGET_ARCH),x86_64)\n"); f.Puts("\t$(UPX) $(UPXFLAGS) $(TARGET)\n"); //f.Puts("endif\n"); f.Puts("endif\n"); diff --git a/ide/src/project/ProjectNode.ec b/ide/src/project/ProjectNode.ec index d08873a..c81f067 100644 --- a/ide/src/project/ProjectNode.ec +++ b/ide/src/project/ProjectNode.ec @@ -451,9 +451,9 @@ private: { if(!platforms.Find(unknown)) // unknown is "Common" { - // e.g. ifneq "$(or $(or $(OSX_TARGET),$(LINUX_TARGET)),$(WINDOWS_TARGET))" + // e.g. ifneq ($(or $(or $(OSX_TARGET),$(LINUX_TARGET)),$(WINDOWS_TARGET)),) int i = 0; - f.Puts("ifneq \""); + f.Puts("ifneq ("); for(i = 0; platforms.count && i < platforms.count - 1; i++) f.Puts("$(or "); i = 0; @@ -468,7 +468,7 @@ private: f.Puts(")"); i++; } - f.Puts("\" \"\"\n"); + f.Puts(",)\n"); (*ifCount)++; } else