quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow specifying executable type

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@391 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-07-25 10:23:32 +00:00
parent a2eceb0f18
commit a94abb3026
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -155,7 +155,7 @@ ifeq ($(OS),Linux)
CFLAGS_COMMON += -fPIC CFLAGS_COMMON += -fPIC
LDFLAGS_DLL = -fPIC -ldl LDFLAGS_DLL = -fPIC -ldl
LIBS_COMMON = -lpthread LIBS_COMMON = -lpthread
EXE = x86 EXE ?= x86
A = a A = a
DLL = so DLL = so
MWINDOWS = MWINDOWS =
@ -166,7 +166,7 @@ ifeq ($(OS),Win32)
CFLAGS_COMMON += -mms-bitfields CFLAGS_COMMON += -mms-bitfields
LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
LIBS_COMMON = -lws2_32 -luser32 -lgdi32 LIBS_COMMON = -lws2_32 -luser32 -lgdi32
EXE = exe EXE ?= exe
A = a A = a
DLL = dll DLL = dll
MWINDOWS = -mwindows MWINDOWS = -mwindows
@ -186,7 +186,7 @@ ifeq ($(OS),Darwin)
CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
LDFLAGS_DLL += -dynamiclib -ldl LDFLAGS_DLL += -dynamiclib -ldl
EXE = ppc EXE ?= ppc
A = a A = a
DLL = dylib DLL = dylib
MWINDOWS = MWINDOWS =
@ -215,13 +215,16 @@ RADIANT_MAJOR_VERSION = 5
RADIANT_MINOR_VERSION = 0 RADIANT_MINOR_VERSION = 0
Q3MAP_VERSION = 2.5.17n Q3MAP_VERSION = 2.5.17n
# Executable extension
RADIANT_EXECUTABLE := $(EXE)
SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;') SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;')
ifneq ($(SVN_VERSION),) ifneq ($(SVN_VERSION),)
RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION) RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION)
Q3MAP_VERSION := $(Q3MAP_VERSION)-svn$(SVN_VERSION) Q3MAP_VERSION := $(Q3MAP_VERSION)-svn$(SVN_VERSION)
endif endif
CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
.PHONY: all .PHONY: all
all: \ all: \

15
radiant/qe3.cpp
View File

@ -170,23 +170,10 @@ bool ConfirmModified(const char* title)
return true; return true;
} }
const char* const EXECUTABLE_TYPE =
#if defined(__linux__) || defined (__FreeBSD__)
"x86"
#elif defined(__APPLE__)
"ppc"
#elif defined(WIN32)
"exe"
#else
#error "unknown platform"
#endif
;
void bsp_init() void bsp_init()
{ {
build_set_variable("RadiantPath", AppPath_get()); build_set_variable("RadiantPath", AppPath_get());
build_set_variable("ExecutableType", EXECUTABLE_TYPE); build_set_variable("ExecutableType", RADIANT_EXECUTABLE);
build_set_variable("EnginePath", EnginePath_get()); build_set_variable("EnginePath", EnginePath_get());
build_set_variable("MonitorAddress", (g_WatchBSP_Enabled) ? "127.0.0.1:39000" : ""); build_set_variable("MonitorAddress", (g_WatchBSP_Enabled) ? "127.0.0.1:39000" : "");
build_set_variable("GameName", gamename_get()); build_set_variable("GameName", gamename_get());