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

possibly working Win32 build; make -j broken again (see no good way to force version.h making before everything else, my old way made make rebuild everything every time)

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@51 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-15 19:20:47 +00:00
parent 87fabc6a53
commit 6c5961123d
2 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Makefile
View File

@ -1,10 +1,38 @@
include Makefile.conf include Makefile.conf
CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fPIC CFLAGS = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fPIC
CPPFLAGS = CPPFLAGS =
CXXFLAGS = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti LDFLAGS =
LIBS =
CXXFLAGS = $(CFLAGS) -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti
CFLAGS_OPT = -O3
CFLAGS_OPT ?= -O3 ifneq ($(MINGW),)
MINGWPREFIX ?= i586-mingw32msvc-
CC = $(MINGWPREFIX)gcc
CXX = $(MINGWPREFIX)g++
RANLIB = $(MINGWPREFIX)ranlib
AR = $(MINGWPREFIX)ar
OS := Win32
CPPFLAGS += -I$(MINGW)/include -D_inline=inline
CFLAGS += -mms-bitfields
LDFLAGS += -L$(MINGW)/lib
CPPFLAGS_GLIB = -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include
LIBS_GLIB = -lglib-2.0
CPPFLAGS_XML = -I$(MINGW)/include/libxml2
LIBS_XML = -lxml2
CPPFLAGS_PNG = -I$(MINGW)/include/libpng12 -DPNG_NO_MMX_CODE
LIBS_PNG = -lpng12
CPPFLAGS_GTK = -I$(MINGW)/include/gtk-2.0 -I$(MINGW)/lib/gtk-2.0/include -I$(MINGW)/include/atk-1.0 -I$(MINGW)/include/cairo -I$(MINGW)/include/pango-1.0 -I$(MINGW)/include/glib-2.0 -I$(MINGW)/lib/glib-2.0/include -I$(MINGW)/include/libpng12 -DPNG_NO_MMX_CODE
LIBS_GTK = -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpangowin32-1.0
CPPFLAGS_GTKGLEXT = -I$(MINGW)/include/gtkglext-1.0 -I$(MINGW)/lib/gtkglext-1.0/include
LIBS_GTKGLEXT = -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lpangowin32-1.0
CPPFLAGS_GL =
LIBS_GL = -lopengl32
CPPFLAGS_DL =
LIBS_DL =
endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
CFLAGS += -g3 CFLAGS += -g3
@ -23,25 +51,34 @@ ifeq ($(OS),Linux)
EXE = x86 EXE = x86
A = a A = a
DLL = so DLL = so
NETAPI = berkley
CPPFLAGS_GLIB = `pkg-config glib-2.0 --cflags`
LIBS_GLIB = `pkg-config glib-2.0 --libs-only-l --libs-only-L`
CPPFLAGS_XML = `xml2-config --cflags`
LIBS_XML = `xml2-config --libs`
CPPFLAGS_PNG = `libpng-config --cflags`
LIBS_PNG = `libpng-config --libs`
CPPFLAGS_GTK = `pkg-config gtk+-2.0 --cflags`
LIBS_GTK = `pkg-config gtk+-2.0 --libs-only-l --libs-only-L`
CPPFLAGS_GTKGLEXT = `pkg-config gtkglext-1.0 --cflags`
LIBS_GTKGLEXT = `pkg-config gtkglext-1.0 --libs-only-l --libs-only-L`
else ifeq ($(OS),Win32) else ifeq ($(OS),Win32)
$(error Unsupported build OS) CPPFLAGS += -DWIN32 -D_WIN32
LDFLAGS_DLL = -fPIC
LIBS = -lws2_32 -luser32 -lgdi32
EXE = exe
A = a
DLL = dll
else ifeq ($(OS),Darwin) else ifeq ($(OS),Darwin)
$(error Unsupported build OS) $(error Unsupported build OS)
else else
$(error Unsupported build OS) $(error Unsupported build OS)
endif endif
CPPFLAGS_GLIB ?= `pkg-config glib-2.0 --cflags`
LIBS_GLIB ?= `pkg-config glib-2.0 --libs-only-l --libs-only-L`
CPPFLAGS_XML ?= `xml2-config --cflags`
LIBS_XML ?= `xml2-config --libs`
CPPFLAGS_PNG ?= `libpng-config --cflags`
LIBS_PNG ?= `libpng-config --libs`
CPPFLAGS_GTK ?= `pkg-config gtk+-2.0 --cflags`
LIBS_GTK ?= `pkg-config gtk+-2.0 --libs-only-l --libs-only-L`
CPPFLAGS_GTKGLEXT ?= `pkg-config gtkglext-1.0 --cflags`
LIBS_GTKGLEXT ?= `pkg-config gtkglext-1.0 --libs-only-l --libs-only-L`
CPPFLAGS_GL ?=
LIBS_GL ?= -lGL
CPPFLAGS_DL ?=
LIBS_DL ?= -ldl
RADIANT_ABOUTMSG = Custom build RADIANT_ABOUTMSG = Custom build
LDD ?= ldd LDD ?= ldd
@ -68,6 +105,7 @@ TEE_STDERR ?= | tee /dev/stderr
.PHONY: all .PHONY: all
all: \ all: \
makeversion \
install/heretic2/h2data.$(EXE) \ install/heretic2/h2data.$(EXE) \
install/modules/archivepak.$(DLL) \ install/modules/archivepak.$(DLL) \
install/modules/archivewad.$(DLL) \ install/modules/archivewad.$(DLL) \
@ -103,7 +141,7 @@ clean:
%.$(EXE): %.$(EXE):
dir=$@; $(MKDIR) $${dir%/*} dir=$@; $(MKDIR) $${dir%/*}
$(CXX) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_EXTRA) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS_EXTRA) $(LIBS)
[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
%.$(A): %.$(A):
@ -112,13 +150,13 @@ clean:
%.$(DLL): %.$(DLL):
dir=$@; $(MKDIR) $${dir%/*} dir=$@; $(MKDIR) $${dir%/*}
$(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) $(LIBS_EXTRA) $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS_EXTRA) $(LIBS)
[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
%.o: %.cpp makeversion %.o: %.cpp
$(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA)
%.o: %.c makeversion %.o: %.c
$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA)
install/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) install/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
@ -188,7 +226,7 @@ libmathlib.$(A): \
libl_net.$(A): CPPFLAGS_EXTRA := -Ilibs libl_net.$(A): CPPFLAGS_EXTRA := -Ilibs
libl_net.$(A): \ libl_net.$(A): \
libs/l_net/l_net.o \ libs/l_net/l_net.o \
libs/l_net/l_net_$(NETAPI).o \ $(if $(findstring $(OS),Win32),libs/l_net/l_net_wins.o,libs/l_net/l_net_berkley.o) \
libjpeg6.$(A): CPPFLAGS_EXTRA := -Ilibs/jpeg6 -Ilibs libjpeg6.$(A): CPPFLAGS_EXTRA := -Ilibs/jpeg6 -Ilibs
libjpeg6.$(A): \ libjpeg6.$(A): \
@ -271,8 +309,8 @@ install/q3data.$(EXE): \
libl_net.$(A) \ libl_net.$(A) \
libmathlib.$(A) \ libmathlib.$(A) \
install/radiant.$(EXE): LIBS_EXTRA := -ldl -lGL -static-libgcc $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) install/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT)
install/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude install/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude
install/radiant.$(EXE): \ install/radiant.$(EXE): \
radiant/autosave.o \ radiant/autosave.o \
radiant/brushmanip.o \ radiant/brushmanip.o \
@ -313,6 +351,7 @@ install/radiant.$(EXE): \
radiant/mainframe.o \ radiant/mainframe.o \
radiant/main.o \ radiant/main.o \
radiant/map.o \ radiant/map.o \
$(if $(findstring $(OS),Win32),radiant/multimon.o,) \
radiant/mru.o \ radiant/mru.o \
radiant/nullmodel.o \ radiant/nullmodel.o \
radiant/parse.o \ radiant/parse.o \

6
radiant/environment.cpp
View File

@ -150,18 +150,16 @@ void environment_init(int argc, char* argv[])
#elif defined(WIN32) #elif defined(WIN32)
#include <windows.h> #include <windows.h>
#include <shfolder.h>
void environment_init(int argc, char* argv[]) void environment_init(int argc, char* argv[])
{ {
args_init(argc, argv); args_init(argc, argv);
{ {
char appdata[MAX_PATH+1]; char *appdata = getenv("APPDATA");
SHGetFolderPath(0, CSIDL_APPDATA, 0, 0, appdata);
StringOutputStream home(256); StringOutputStream home(256);
if(string_empty(appdata)) if(!appdata || string_empty(appdata))
{ {
ERROR_MESSAGE("Application Data folder not available.\n" ERROR_MESSAGE("Application Data folder not available.\n"
"Please install shfolder redistributable package.\n" "Please install shfolder redistributable package.\n"