From 3f71230030a5f77bc7ecf0bfa4a3ead878b42ea5 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 6 Jun 2021 19:08:06 +0200 Subject: [PATCH] Update globaldefs.h to fix the POSIX check and disable our Makefile hard- code of -DPOSIX --- README.md | 16 ++++++++-------- libs/cmdlib/Makefile | 2 +- libs/container/Makefile | 2 +- libs/ddslib/Makefile | 2 +- libs/debugging/Makefile | 2 +- libs/etclib/Makefile | 2 +- libs/filematch/Makefile | 2 +- libs/generic/Makefile | 2 +- libs/globaldefs.h | 2 +- libs/gtkutil/Makefile | 2 +- libs/l_net/Makefile | 2 +- libs/math/Makefile | 2 +- libs/mathlib/Makefile | 2 +- libs/memory/Makefile | 2 +- libs/modulesystem/Makefile | 2 +- libs/os/Makefile | 2 +- libs/picomodel/Makefile | 2 +- libs/profile/Makefile | 2 +- libs/script/Makefile | 2 +- libs/signal/Makefile | 2 +- libs/splines/Makefile | 2 +- libs/stream/Makefile | 2 +- libs/string/Makefile | 2 +- libs/uilib/Makefile | 2 +- libs/xml/Makefile | 2 +- plugins/archivezip/Makefile | 2 +- plugins/brushexport/Makefile | 2 +- plugins/entity/Makefile | 2 +- plugins/image/Makefile | 2 +- plugins/iqmmodel/Makefile | 2 +- plugins/mapq3/Makefile | 2 +- plugins/model/Makefile | 2 +- plugins/prtview/Makefile | 2 +- plugins/shaders/Makefile | 2 +- plugins/vfspk3/Makefile | 2 +- src/Makefile | 2 +- tools/Makefile | 2 +- 37 files changed, 44 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index ec1f733..d5a0a83 100644 --- a/README.md +++ b/README.md @@ -14,16 +14,16 @@ There's plenty of other editors for the first-party id Tech games. ![Screenshot](docs/screen.jpg) ## Editor Changes -- All texture coordinates use the Valve 220 format for compatibility with WorldCraft exported .map files -- Integration with our material system (goodbye .shader files) -- Support for vertex-color/alpha editing of patches using our new fixed patch format, allowing technologies such as 4-way texture blending and whatever your designers can imagine. +- Valve 220 format is used top to bottom, imported & exported, with texture coords handled internally the same way +- Integration with our material system (no more .shader files) +- Support for vertex-color/alpha editing of patches using our new fixed patch format, allowing technologies such as 4-way texture blending and whatever your designers can imagine - Gracefully deals with duplicate entity attribute key/value pairs, to support features like Source Engine style Input/Output system for triggers -- Lots of bug fixes, like the 'ghost-ent' bug, which places dummy ents at the center of your map which somehow had flown other peoples radar for 20+ years -- Simplified build system, so less dependencies! +- Simplified build system that doesn't suddenly break on its own, also less dependencies - Support for VVM/IQM model format in the BSP compiler -- Support for High-Dynamic-Range lightmaps in the BSP compiler -- Support for Cubemap aware surfaces in the BSP compiler -- Support for our patchDef2WS and patchDef3WS curved surfaces in the compiler +- Support for internal and external High-Dynamic-Range lightmaps in the BSP compiler +- Support for cubemap aware surfaces in the BSP compiler +- Support for our patchDef2WS and patchDef3WS curved surfaces in the BSP compiler +- More bug-fixes than you could possibly imagine ## Compiling To compile on a standard GNU/Linux system: diff --git a/libs/cmdlib/Makefile b/libs/cmdlib/Makefile index 4b747c9..235d1e3 100644 --- a/libs/cmdlib/Makefile +++ b/libs/cmdlib/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/container/Makefile b/libs/container/Makefile index f701f29..269e838 100644 --- a/libs/container/Makefile +++ b/libs/container/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/ddslib/Makefile b/libs/ddslib/Makefile index c5aa975..38a6588 100644 --- a/libs/ddslib/Makefile +++ b/libs/ddslib/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CC=$(CC) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .c.o: diff --git a/libs/debugging/Makefile b/libs/debugging/Makefile index b4cecac..cf3e127 100644 --- a/libs/debugging/Makefile +++ b/libs/debugging/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/etclib/Makefile b/libs/etclib/Makefile index c8ebb1f..f86215e 100644 --- a/libs/etclib/Makefile +++ b/libs/etclib/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CC=$(CC) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .c.o: diff --git a/libs/filematch/Makefile b/libs/filematch/Makefile index aeb1102..9986b61 100644 --- a/libs/filematch/Makefile +++ b/libs/filematch/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CC=$(CC) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .c.o: diff --git a/libs/generic/Makefile b/libs/generic/Makefile index 3dca823..45e95c6 100644 --- a/libs/generic/Makefile +++ b/libs/generic/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/globaldefs.h b/libs/globaldefs.h index 9260122..316bfcc 100644 --- a/libs/globaldefs.h +++ b/libs/globaldefs.h @@ -25,7 +25,7 @@ // OS -#if defined(POSIX) +#if defined(POSIX) || defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) #define GDEF_OS_POSIX 1 #else #define GDEF_OS_POSIX 0 diff --git a/libs/gtkutil/Makefile b/libs/gtkutil/Makefile index c4bb142..1e28f85 100644 --- a/libs/gtkutil/Makefile +++ b/libs/gtkutil/Makefile @@ -1,7 +1,7 @@ # WorldSpawn Makefile GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I/usr/include/gtkglext-1.0 -I/usr/lib64/gtkglext-1.0/include/ -I../../libs -DGTK_TARGET=2 -DPOSIX -DXWINDOWS +LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I/usr/include/gtkglext-1.0 -I/usr/lib64/gtkglext-1.0/include/ -I../../libs -DGTK_TARGET=2 -DXWINDOWS DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/l_net/Makefile b/libs/l_net/Makefile index 71c9382..6227a2a 100644 --- a/libs/l_net/Makefile +++ b/libs/l_net/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CC=$(CC) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .c.o: diff --git a/libs/math/Makefile b/libs/math/Makefile index 9a17352..d9c225b 100644 --- a/libs/math/Makefile +++ b/libs/math/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/mathlib/Makefile b/libs/mathlib/Makefile index 2e48089..937bcf2 100644 --- a/libs/mathlib/Makefile +++ b/libs/mathlib/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CC=$(CC) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .c.o: diff --git a/libs/memory/Makefile b/libs/memory/Makefile index 51888ab..410b36f 100644 --- a/libs/memory/Makefile +++ b/libs/memory/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/modulesystem/Makefile b/libs/modulesystem/Makefile index 25a5e73..0eb7f27 100644 --- a/libs/modulesystem/Makefile +++ b/libs/modulesystem/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/os/Makefile b/libs/os/Makefile index 8fbdb8e..473f1cc 100644 --- a/libs/os/Makefile +++ b/libs/os/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/picomodel/Makefile b/libs/picomodel/Makefile index 89b782d..b8e225f 100644 --- a/libs/picomodel/Makefile +++ b/libs/picomodel/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CC=$(CC) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .c.o: diff --git a/libs/profile/Makefile b/libs/profile/Makefile index a6c7091..edb08e3 100644 --- a/libs/profile/Makefile +++ b/libs/profile/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/script/Makefile b/libs/script/Makefile index 36b5337..24449cc 100644 --- a/libs/script/Makefile +++ b/libs/script/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/signal/Makefile b/libs/signal/Makefile index d84fbd9..bfd9233 100644 --- a/libs/signal/Makefile +++ b/libs/signal/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/splines/Makefile b/libs/splines/Makefile index a1beebd..d348302 100644 --- a/libs/splines/Makefile +++ b/libs/splines/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/stream/Makefile b/libs/stream/Makefile index b717df9..1d701b7 100644 --- a/libs/stream/Makefile +++ b/libs/stream/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/string/Makefile b/libs/string/Makefile index a426bda..02cdcae 100644 --- a/libs/string/Makefile +++ b/libs/string/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Makefile -LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX +LIB_CFLAGS=$(CFLAGS) -I../../include -I../../libs DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/uilib/Makefile b/libs/uilib/Makefile index 6925190..f963178 100644 --- a/libs/uilib/Makefile +++ b/libs/uilib/Makefile @@ -1,7 +1,7 @@ # WorldSpawn Makefile GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 -DPOSIX -DXWINDOWS +LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 -DXWINDOWS DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/libs/xml/Makefile b/libs/xml/Makefile index de02b0a..de9d084 100644 --- a/libs/xml/Makefile +++ b/libs/xml/Makefile @@ -1,7 +1,7 @@ # WorldSpawn Makefile GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 -DPOSIX -DXWINDOWS +LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 -DXWINDOWS DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< .cpp.o: diff --git a/plugins/archivezip/Makefile b/plugins/archivezip/Makefile index a28797b..3ed8f78 100644 --- a/plugins/archivezip/Makefile +++ b/plugins/archivezip/Makefile @@ -1,6 +1,6 @@ # WorldSpawn Plugin Makefile -PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/brushexport/Makefile b/plugins/brushexport/Makefile index 5fd2642..26aeeb0 100644 --- a/plugins/brushexport/Makefile +++ b/plugins/brushexport/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< diff --git a/plugins/entity/Makefile b/plugins/entity/Makefile index 6d908c2..ef3c86b 100644 --- a/plugins/entity/Makefile +++ b/plugins/entity/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/image/Makefile b/plugins/image/Makefile index acb27b9..062db16 100644 --- a/plugins/image/Makefile +++ b/plugins/image/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared -ljpeg DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/iqmmodel/Makefile b/plugins/iqmmodel/Makefile index b399205..2670e88 100644 --- a/plugins/iqmmodel/Makefile +++ b/plugins/iqmmodel/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/mapq3/Makefile b/plugins/mapq3/Makefile index 0d507f0..62beeeb 100644 --- a/plugins/mapq3/Makefile +++ b/plugins/mapq3/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/model/Makefile b/plugins/model/Makefile index 39e9047..02658ef 100644 --- a/plugins/model/Makefile +++ b/plugins/model/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/prtview/Makefile b/plugins/prtview/Makefile index cf5ff85..d205f7c 100644 --- a/plugins/prtview/Makefile +++ b/plugins/prtview/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/shaders/Makefile b/plugins/shaders/Makefile index f8f79f4..0482421 100644 --- a/plugins/shaders/Makefile +++ b/plugins/shaders/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/plugins/vfspk3/Makefile b/plugins/vfspk3/Makefile index dfbd27f..1703bcd 100644 --- a/plugins/vfspk3/Makefile +++ b/plugins/vfspk3/Makefile @@ -2,7 +2,7 @@ GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/src/Makefile b/src/Makefile index 352bd84..71014a9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,7 +25,7 @@ WS_LIBS= ../libs/libcmdlib.a \ ../libs/libuilib.a \ ../libs/libxmllib.a -WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION) -DPOSIX -DXWINDOWS +WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION) -DXWINDOWS WS_LDFLAGS=$(LDFLAGS) -lm $(GTK_LDFLAGS) -lX11 -lGL -lxml2 -lgdkglext-x11-1.0 -lgtkglext-x11-1.0 -L../lib $(WS_LIBS) DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $< diff --git a/tools/Makefile b/tools/Makefile index c586a7e..6c67863 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,7 +10,7 @@ LIBOBJS=../libs/libddslib.a \ GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0) GLIB_LDFLAGS=$(shell pkg-config --libs glib-2.0) -VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../include -I./common -I../libs -DPOSIX -Wno-narrowing +VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../include -I./common -I../libs -Wno-narrowing VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -lm -lpthread -L../lib -lxml2 -ljpeg -lpng -lminizip $(LIBOBJS) DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<