From: rpolzer Date: Thu, 18 Sep 2008 09:39:06 +0000 (+0000) Subject: git-svn-id: svn://svn.icculus.org/netradiant/trunk@87 61c419a2-8eb2-4b30-bcec-8cead03... X-Git-Tag: svn-r421~333 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=01a2a09b615ea929ff3c12c8f36ad42269881278 git-svn-id: svn://svn.icculus.org/netradiant/trunk@87 61c419a2-8eb2-4b30-bcec-8cead039b335 --- diff --git a/ChangeLog b/ChangeLog index 74bf1d22..7a29761a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-18 Rudolf Polzer divVerent(at)alientrap.org + * radiant: handle missing anisotropy extension; fixes display bug on + Windows XP software renderer + * radiant: make logging kick in earlier + * radiant: add svn release to the version number + 2008-09-15 Rudolf Polzer divVerent(at)alientrap.org * all: added a Makefile to build GtkRadiant; this replaces scons and python install.py diff --git a/Makefile b/Makefile index 4ae85201..a582e2aa 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ CXX ?= g++ RANLIB ?= ranlib AR ?= ar LDD ?= ldd # nothing on Win32 +WINDRES ?= # only used on Win32 PKGCONFIG ?= pkg-config PKG_CONFIG_PATH ?= @@ -204,6 +205,7 @@ dependencies-check: checkbinary g++ "$(CXX)"; \ checkbinary binutils "$(RANLIB)"; \ checkbinary binutils "$(AR)"; \ + [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \ [ "$(OS)" != "Win32" ] && checkbinary libc6 "$(LDD)"; \ $(ECHO) All required tools have been found! @$(ECHO) @@ -286,6 +288,14 @@ clean: $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -shared -o $@ [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } +%.rc: %.ico + $(ECHO) '1 ICON "$<"' > $@ + +ifeq ($(OS),Win32) +%.o: %.rc + $(WINDRES) $< $@ +endif + %.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@ @@ -347,6 +357,7 @@ install/q3map2.$(EXE): \ libl_net.$(A) \ libmathlib.$(A) \ libpicomodel.$(A) \ + $(if $(findstring $(OS),Win32),icons/q3map2.o,) \ libmathlib.$(A): CPPFLAGS_EXTRA := -Ilibs libmathlib.$(A): \ @@ -441,6 +452,7 @@ install/q3data.$(EXE): \ tools/quake3/q3data/video.o \ libl_net.$(A) \ libmathlib.$(A) \ + $(if $(findstring $(OS),Win32),icons/q3data.o,) \ install/radiant.$(EXE): LDFLAGS_EXTRA := $(MWINDOWS) install/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) @@ -533,6 +545,7 @@ install/radiant.$(EXE): \ libmathlib.$(A) \ libprofile.$(A) \ libxmllib.$(A) \ + $(if $(findstring $(OS),Win32),icons/radiant.o,) \ libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs libcmdlib.$(A): \ @@ -773,6 +786,7 @@ install/qdata3.$(EXE): \ tools/quake2/qdata/tables.o \ tools/quake2/qdata/video.o \ libl_net.$(A) \ + $(if $(findstring $(OS),Win32),icons/qdata3.o,) \ install/q2map.$(EXE): LIBS_EXTRA := $(LIBS_XML) install/q2map.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/common -Ilibs -Iinclude @@ -810,6 +824,7 @@ install/q2map.$(EXE): \ tools/quake2/q2map/tree.o \ tools/quake2/q2map/writebsp.o \ libl_net.$(A) \ + $(if $(findstring $(OS),Win32),icons/q2map.o,) \ install/plugins/ufoaiplug.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK) install/plugins/ufoaiplug.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude @@ -860,6 +875,7 @@ install/heretic2/h2data.$(EXE): \ tools/quake2/qdata_heretic2/tmix.o \ tools/quake2/qdata_heretic2/video.o \ libl_net.$(A) \ + $(if $(findstring $(OS),Win32),icons/h2data.o,) \ .PHONY: install-data install-data: binaries diff --git a/cross-Makefile.conf b/cross-Makefile.conf index 26fcdc65..1fd92f99 100644 --- a/cross-Makefile.conf +++ b/cross-Makefile.conf @@ -25,3 +25,4 @@ CXX = $(MINGW_EXEC_PREFIX)g++ LDD = RANLIB = $(MINGW_EXEC_PREFIX)ranlib AR = $(MINGW_EXEC_PREFIX)ar +WINDRES = $(MINGW_EXEC_PREFIX)windres diff --git a/icons/h2data.ico b/icons/h2data.ico new file mode 100644 index 00000000..8f441941 Binary files /dev/null and b/icons/h2data.ico differ diff --git a/icons/q2map.ico b/icons/q2map.ico new file mode 100644 index 00000000..5c508c91 Binary files /dev/null and b/icons/q2map.ico differ diff --git a/icons/q3data.ico b/icons/q3data.ico new file mode 100644 index 00000000..8f441941 Binary files /dev/null and b/icons/q3data.ico differ diff --git a/icons/q3map2.ico b/icons/q3map2.ico new file mode 100644 index 00000000..4fe56fa6 Binary files /dev/null and b/icons/q3map2.ico differ diff --git a/icons/qdata3.ico b/icons/qdata3.ico new file mode 100644 index 00000000..8f441941 Binary files /dev/null and b/icons/qdata3.ico differ diff --git a/icons/radiant-src.png b/icons/radiant-src.png new file mode 100644 index 00000000..720e9857 Binary files /dev/null and b/icons/radiant-src.png differ diff --git a/icons/radiant.ico b/icons/radiant.ico new file mode 100644 index 00000000..3ac19c15 Binary files /dev/null and b/icons/radiant.ico differ diff --git a/radiant/console.cpp b/radiant/console.cpp index ad282f16..94a496f6 100644 --- a/radiant/console.cpp +++ b/radiant/console.cpp @@ -54,6 +54,8 @@ void Sys_LogFile(bool enable) if (enable && !g_hLogFile) { // settings say we should be logging and we don't have a log file .. so create it + if(!SettingsPath_get()[0]) + return; // cannot open a log file yet // open a file to log the console (if user prefs say so) // the file handle is g_hLogFile // the log file is erased diff --git a/radiant/environment.cpp b/radiant/environment.cpp index 8ca7eb0d..45266919 100644 --- a/radiant/environment.cpp +++ b/radiant/environment.cpp @@ -162,7 +162,6 @@ void environment_init(int argc, char* argv[]) if(!appdata || string_empty(appdata)) { ERROR_MESSAGE("Application Data folder not available.\n" - "Please install shfolder redistributable package.\n" "Radiant will use C:\\ for user preferences.\n"); home << "C:"; } diff --git a/radiant/main.cpp b/radiant/main.cpp index ff10ebac..99182f8c 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -325,7 +325,7 @@ void paths_init() { StringOutputStream path(256); - path << home << RADIANT_VERSION << '/'; + path << home << "1." << RADIANT_MAJOR_VERSION "." << RADIANT_MINOR_VERSION << '/'; g_strSettingsPath = path.c_str(); } diff --git a/setup/data/tools/bitmaps/icon.bmp b/setup/data/tools/bitmaps/icon.bmp index e270952b..01aec6ea 100644 Binary files a/setup/data/tools/bitmaps/icon.bmp and b/setup/data/tools/bitmaps/icon.bmp differ