diff --git a/include/aboutmsg.h b/include/aboutmsg.h deleted file mode 100644 index 4d414af..0000000 --- a/include/aboutmsg.h +++ /dev/null @@ -1,4 +0,0 @@ -// Makefile appends preprocessor flags instead now -#ifndef WorldSpawn_ABOUTMSG -#error no WorldSpawn_ABOUTMSG defined -#endif diff --git a/include/version.h b/include/version.h deleted file mode 100644 index b1322a8..0000000 --- a/include/version.h +++ /dev/null @@ -1,13 +0,0 @@ -// Makefile appends preprocessor flags instead now -#ifndef WorldSpawn_VERSION -#error no WorldSpawn_VERSION defined -#endif -#ifndef WorldSpawn_MAJOR_VERSION -#error no WorldSpawn_MAJOR_VERSION defined -#endif -#ifndef WorldSpawn_MINOR_VERSION -#error no WorldSpawn_MINOR_VERSION defined -#endif -#ifndef WorldSpawn_PATCH_VERSION -#error no WorldSpawn_PATCH_VERSION defined -#endif diff --git a/plugins/prtview/AboutDialog.cpp b/plugins/prtview/AboutDialog.cpp index 88d4ecf..0ffc8fa 100644 --- a/plugins/prtview/AboutDialog.cpp +++ b/plugins/prtview/AboutDialog.cpp @@ -21,7 +21,6 @@ #include #include #include -#include "version.h" #include "gtkutil/pointer.h" #include "prtview.h" diff --git a/plugins/prtview/Makefile b/plugins/prtview/Makefile index 70abb5a..cf5ff85 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 -DWorldSpawn_VERSION=1 -DWorldSpawn_MAJOR_VERSION=1 -DWorldSpawn_MINOR_VERSION=0 -DWorldSpawn_PATCH_VERSION=0 +PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DPOSIX -fPIC -fvisibility=hidden PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< diff --git a/radiant/Makefile b/radiant/Makefile index b9474ac..352bd84 100644 --- a/radiant/Makefile +++ b/radiant/Makefile @@ -3,8 +3,6 @@ GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -WS_VERSION= -DWorldSpawn_VERSION="1" -DWorldSpawn_MAJOR_VERSION="0" -DWorldSpawn_MINOR_VERSION="0" -DWorldSpawn_PATCH_VERSION="0" -DWorldSpawn_ABOUTMSG="" - WS_LIBS= ../libs/libcmdlib.a \ ../libs/libcontainer.a \ ../libs/libddslib.a \ diff --git a/radiant/console.cpp b/radiant/console.cpp index 72a0a61..a935e49 100644 --- a/radiant/console.cpp +++ b/radiant/console.cpp @@ -27,8 +27,6 @@ #include "stream/stringstream.h" #include "convert.h" -#include "version.h" -#include "aboutmsg.h" #include "mainframe.h" std::size_t Sys_Print(int level, const char *buf, std::size_t length) diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index 7bfc817..d5b7f5d 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -40,8 +40,6 @@ #include #include "debugging/debugging.h" -#include "version.h" -#include "aboutmsg.h" #include "igl.h" #include "iscenegraph.h" diff --git a/radiant/main.cpp b/radiant/main.cpp index 59daaf8..0264fc5 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -64,8 +64,6 @@ #include "main.h" #include "globaldefs.h" -#include "version.h" - #include "debugging/debugging.h" #include "iundo.h" diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 782920f..c617adc 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -244,7 +244,7 @@ void setEnginePath(const char *path) Map_RegionOff(); #endif - ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Changing Engine Path"); + ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Changing Nuclide Path"); EnginePath_Unrealise(); @@ -316,12 +316,7 @@ bool g_disableEnginePath = false; void Paths_constructPreferences(PreferencesPage &page) { - page.appendPathEntry("Engine Path", true, make_property(g_strEnginePath)); - - page.appendCheckBox( - "", "Do not use Engine Path", - g_disableEnginePath - ); + page.appendPathEntry("Nuclide Path", true, make_property(g_strEnginePath)); } void Paths_constructPage(PreferenceGroup &group) @@ -350,7 +345,7 @@ public: Paths_constructPreferences(preferencesPage); } - return ui::Window(create_simple_modal_dialog_window("Engine Path Not Found", m_modal, frame)); + return ui::Window(create_simple_modal_dialog_window("Nuclide Path Not Found", m_modal, frame)); } }; diff --git a/tools/Makefile b/tools/Makefile index 13f8672..c586a7e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -8,10 +8,9 @@ LIBOBJS=../libs/libddslib.a \ ../libs/libmathlib.a \ ../libs/libpicomodel.a -WS_VERSION= -DWorldSpawn_VERSION="1" -DWorldSpawn_MAJOR_VERSION="0" -DWorldSpawn_MINOR_VERSION="0" -DWorldSpawn_PATCH_VERSION="0" -DWorldSpawn_ABOUTMSG="" -DQ3MAP_VERSION=2.0 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 $(WS_VERSION) +VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../include -I./common -I../libs -DPOSIX -Wno-narrowing VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -lm -lpthread -L../lib -lxml2 -ljpeg -lpng -lminizip $(LIBOBJS) DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $< diff --git a/tools/vmap/bspfile_abstract.c b/tools/vmap/bspfile_abstract.c index dfe59dd..ec11696 100644 --- a/tools/vmap/bspfile_abstract.c +++ b/tools/vmap/bspfile_abstract.c @@ -788,9 +788,6 @@ void InjectCommandLine( char **argv, int beginArgs, int endArgs ){ } *outpos = 0; - /* TODO: Make this a switch */ - /*SetKeyValue( &entities[0], "_q3map2_cmdline", newCommandLine ); - SetKeyValue( &entities[0], "_q3map2_version", Q3MAP_VERSION );*/ } diff --git a/tools/vmap/vmap.h b/tools/vmap/vmap.h index 55a56b0..59ab550 100644 --- a/tools/vmap/vmap.h +++ b/tools/vmap/vmap.h @@ -34,12 +34,6 @@ #include "globaldefs.h" -/* version */ -#ifndef Q3MAP_VERSION -#error no Q3MAP_VERSION defined -#endif - - /* ------------------------------------------------------------------------------- dependencies @@ -63,8 +57,6 @@ /* general */ -#include "version.h" /* ttimo: might want to guard that if built outside of the GtkRadiant tree */ - #include "cmdlib.h" #include "mathlib.h" #include "md5lib.h"