vera/vmap
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minimize the compiler flags we have to pass by removing the VERSION stuff

Browse source
This commit is contained in:
Marco Cawthorne 2021-06-05 17:43:12 +02:00
parent 750b916448
commit b67ea9efd7
12 changed files with 5 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/aboutmsg.h
View file

@ -1,4 +0,0 @@
// Makefile appends preprocessor flags instead now
#ifndef WorldSpawn_ABOUTMSG
#error no WorldSpawn_ABOUTMSG defined
#endif

13
include/version.h
View file

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

1
plugins/prtview/AboutDialog.cpp
View file

@ -21,7 +21,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtkutil/pointer.h> #include <gtkutil/pointer.h>
#include <uilib/uilib.h> #include <uilib/uilib.h>
#include "version.h"
#include "gtkutil/pointer.h" #include "gtkutil/pointer.h"
#include "prtview.h" #include "prtview.h"

2
plugins/prtview/Makefile
View file

@ -2,7 +2,7 @@
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 -DXWINDOWS
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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 PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<

2
radiant/Makefile
View file

@ -3,8 +3,6 @@
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
GTK_LDFLAGS=$(shell pkg-config --libs 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 \ WS_LIBS= ../libs/libcmdlib.a \
../libs/libcontainer.a \ ../libs/libcontainer.a \
../libs/libddslib.a \ ../libs/libddslib.a \

2
radiant/console.cpp
View file

@ -27,8 +27,6 @@
#include "stream/stringstream.h" #include "stream/stringstream.h"
#include "convert.h" #include "convert.h"
#include "version.h"
#include "aboutmsg.h"
#include "mainframe.h" #include "mainframe.h"
std::size_t Sys_Print(int level, const char *buf, std::size_t length) std::size_t Sys_Print(int level, const char *buf, std::size_t length)

2
radiant/gtkdlgs.cpp
View file

@ -40,8 +40,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "debugging/debugging.h" #include "debugging/debugging.h"
#include "version.h"
#include "aboutmsg.h"
#include "igl.h" #include "igl.h"
#include "iscenegraph.h" #include "iscenegraph.h"

2
radiant/main.cpp
View file

@ -64,8 +64,6 @@
#include "main.h" #include "main.h"
#include "globaldefs.h" #include "globaldefs.h"
#include "version.h"
#include "debugging/debugging.h" #include "debugging/debugging.h"
#include "iundo.h" #include "iundo.h"

11
radiant/mainframe.cpp
View file

@ -244,7 +244,7 @@ void setEnginePath(const char *path)
Map_RegionOff(); Map_RegionOff();
#endif #endif
ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Changing Engine Path"); ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Changing Nuclide Path");
EnginePath_Unrealise(); EnginePath_Unrealise();
@ -316,12 +316,7 @@ bool g_disableEnginePath = false;
void Paths_constructPreferences(PreferencesPage &page) void Paths_constructPreferences(PreferencesPage &page)
{ {
page.appendPathEntry("Engine Path", true, make_property<EnginePath>(g_strEnginePath)); page.appendPathEntry("Nuclide Path", true, make_property<EnginePath>(g_strEnginePath));
page.appendCheckBox(
"", "Do not use Engine Path",
g_disableEnginePath
);
} }
void Paths_constructPage(PreferenceGroup &group) void Paths_constructPage(PreferenceGroup &group)
@ -350,7 +345,7 @@ public:
Paths_constructPreferences(preferencesPage); 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));
} }
}; };

3
tools/Makefile
View file

@ -8,10 +8,9 @@ LIBOBJS=../libs/libddslib.a \
../libs/libmathlib.a \ ../libs/libmathlib.a \
../libs/libpicomodel.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_CFLAGS=$(shell pkg-config --cflags glib-2.0)
GLIB_LDFLAGS=$(shell pkg-config --libs 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) VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -lm -lpthread -L../lib -lxml2 -ljpeg -lpng -lminizip $(LIBOBJS)
DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $< DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<

3
tools/vmap/bspfile_abstract.c
View file

@ -788,9 +788,6 @@ void InjectCommandLine( char **argv, int beginArgs, int endArgs ){
} }
*outpos = 0; *outpos = 0;
/* TODO: Make this a switch */
/*SetKeyValue( &entities[0], "_q3map2_cmdline", newCommandLine );
SetKeyValue( &entities[0], "_q3map2_version", Q3MAP_VERSION );*/
} }

8
tools/vmap/vmap.h
View file

@ -34,12 +34,6 @@
#include "globaldefs.h" #include "globaldefs.h"
/* version */
#ifndef Q3MAP_VERSION
#error no Q3MAP_VERSION defined
#endif
/* ------------------------------------------------------------------------------- /* -------------------------------------------------------------------------------
dependencies dependencies
@ -63,8 +57,6 @@
/* general */ /* general */
#include "version.h" /* ttimo: might want to guard that if built outside of the GtkRadiant tree */
#include "cmdlib.h" #include "cmdlib.h"
#include "mathlib.h" #include "mathlib.h"
#include "md5lib.h" #include "md5lib.h"