tech
/
worldspawn
2
0
Fork 0
Code Issues 16 Pull Requests Projects Releases Wiki Activity

Update globaldefs.h to fix the POSIX check and disable our Makefile hard- 

code of -DPOSIX
This commit is contained in:
Marco Cawthorne 2021-06-06 19:08:06 +02:00
parent e61037291a
commit 3f71230030
37 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -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:

2
libs/cmdlib/Makefile
View File

@ -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:

2
libs/container/Makefile
View File

@ -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:

2
libs/ddslib/Makefile
View File

@ -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:

2
libs/debugging/Makefile
View File

@ -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:

2
libs/etclib/Makefile
View File

@ -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:

2
libs/filematch/Makefile
View File

@ -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:

2
libs/generic/Makefile
View File

@ -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:

2
libs/globaldefs.h
View File

@ -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

2
libs/gtkutil/Makefile
View File

@ -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:

2
libs/l_net/Makefile
View File

@ -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:

2
libs/math/Makefile
View File

@ -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:

2
libs/mathlib/Makefile
View File

@ -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:

2
libs/memory/Makefile
View File

@ -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:

2
libs/modulesystem/Makefile
View File

@ -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:

2
libs/os/Makefile
View File

@ -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:

2
libs/picomodel/Makefile
View File

@ -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:

2
libs/profile/Makefile
View File

@ -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:

2
libs/script/Makefile
View File

@ -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:

2
libs/signal/Makefile
View File

@ -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:

2
libs/splines/Makefile
View File

@ -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:

2
libs/stream/Makefile
View File

@ -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:

2
libs/string/Makefile
View File

@ -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:

2
libs/uilib/Makefile
View File

@ -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:

2
libs/xml/Makefile
View File

@ -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:

2
plugins/archivezip/Makefile
View File

@ -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 $<

2
plugins/brushexport/Makefile
View File

@ -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 $<

2
plugins/entity/Makefile
View File

@ -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 $<

2
plugins/image/Makefile
View File

@ -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 $<

2
plugins/iqmmodel/Makefile
View File

@ -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 $<

2
plugins/mapq3/Makefile
View File

@ -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 $<

2
plugins/model/Makefile
View File

@ -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 $<

2
plugins/prtview/Makefile
View File

@ -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 $<

2
plugins/shaders/Makefile
View File

@ -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 $<

2
plugins/vfspk3/Makefile
View File

@ -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 $<

2
src/Makefile
View File

@ -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 $<

2
tools/Makefile
View File

@ -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 $<