Module darkplaces: Change committed
havoc at icculus.org
havoc at icculus.org
Sun Feb 12 15:26:12 EST 2006
Commiter : havoc
CVSROOT : /cvs/cvsroot/twilight
Module : darkplaces
Commit time: 2006-02-12 20:26:12 UTC
Log message:
added nexuiz icon and make rules to make use of it, and now the icon is included in dedicated and sdl builds (not just native client builds)
Modified files:
makefile makefile.bsd makefile.inc
Added files:
nexuiz.ico nexuiz.rc
------=MIME.898acf894b0132e92b51a6601dc6caa3
Content-Type: text/plain; name="darkplaces.20060212.202612.havoc.diff"
Content-Disposition: attachment; filename="darkplaces.20060212.202612.havoc.diff"
Content-Transfer-Encoding: 8bit
Index: darkplaces/makefile
diff -u darkplaces/makefile:1.109 darkplaces/makefile:1.110
--- darkplaces/makefile:1.109 Wed Sep 7 05:58:15 2005
+++ darkplaces/makefile Sun Feb 12 15:26:02 2006
@@ -1,4 +1,4 @@
-##### DP_MAKE_TARGET autodetection and arch specific variables #####
+##### DP_MAKE_TARGET autodetection and arch specific variables #####
ifndef DP_MAKE_TARGET
@@ -54,6 +54,8 @@
OBJ_CD=$(OBJ_LINUXCD)
OBJ_CL=$(OBJ_GLX)
+ OBJ_ICON=
+ OBJ_ICON_NEXUIZ=
LDFLAGS_CL=$(LDFLAGS_LINUXCL)
LDFLAGS_SV=$(LDFLAGS_LINUXSV)
@@ -62,6 +64,9 @@
EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
+ EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+ EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+ EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
endif
# Mac OS X configuration
@@ -70,6 +75,8 @@
OBJ_CD=$(OBJ_MACOSXCD)
OBJ_CL=$(OBJ_AGL)
+ OBJ_ICON=
+ OBJ_ICON_NEXUIZ=
LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
@@ -78,6 +85,9 @@
EXE_CL=$(EXE_MACOSXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
+ EXE_CLNEXUIZ=$(EXE_MACOSXCLNEXUIZ)
+ EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+ EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
endif
# SunOS configuration (Solaris)
@@ -86,6 +96,8 @@
OBJ_CD=$(OBJ_SUNOSCD)
OBJ_CL=$(OBJ_GLX)
+ OBJ_ICON=
+ OBJ_ICON_NEXUIZ=
CFLAGS_EXTRA=$(CFLAGS_SUNOS)
@@ -96,6 +108,9 @@
EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
+ EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+ EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+ EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
endif
# BSD configuration
@@ -108,6 +123,8 @@
OBJ_CD=$(OBJ_BSDCD)
OBJ_CL=$(OBJ_GLX)
+ OBJ_ICON=
+ OBJ_ICON_NEXUIZ=
LDFLAGS_CL=$(LDFLAGS_BSDCL)
LDFLAGS_SV=$(LDFLAGS_BSDSV)
@@ -116,6 +133,9 @@
EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
+ EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+ EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+ EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
endif
# Win32 configuration
@@ -124,6 +144,8 @@
OBJ_CD=$(OBJ_WINCD)
OBJ_CL=$(OBJ_WGL)
+ OBJ_ICON=darkplaces.o
+ OBJ_ICON_NEXUIZ=nexuiz.o
LDFLAGS_CL=$(LDFLAGS_WINCL)
LDFLAGS_SV=$(LDFLAGS_WINSV)
@@ -132,6 +154,9 @@
EXE_CL=$(EXE_WINCL)
EXE_SV=$(EXE_WINSV)
EXE_SDL=$(EXE_WINSDL)
+ EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
+ EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
+ EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
endif
Index: darkplaces/makefile.bsd
diff -u darkplaces/makefile.bsd:1.12 darkplaces/makefile.bsd:1.13
--- darkplaces/makefile.bsd:1.12 Fri Jun 10 03:04:14 2005
+++ darkplaces/makefile.bsd Sun Feb 12 15:26:02 2006
@@ -1,4 +1,4 @@
-##### DP_MAKE_TARGET autodetection and arch specific variables #####
+##### DP_MAKE_TARGET autodetection and arch specific variables #####
.ifndef DP_MAKE_TARGET
@@ -25,6 +25,8 @@
OBJ_CD=$(OBJ_BSDCD)
OBJ_CL=$(OBJ_GLX)
+OBJ_ICON=
+OBJ_ICON_NEXUIZ=
LDFLAGS_CL=$(LDFLAGS_BSDCL)
LDFLAGS_SV=$(LDFLAGS_BSDSV)
@@ -32,6 +34,9 @@
EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
+EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
.endif
Index: darkplaces/makefile.inc
diff -u darkplaces/makefile.inc:1.36 darkplaces/makefile.inc:1.37
--- darkplaces/makefile.inc:1.36 Sun Jan 15 22:52:42 2006
+++ darkplaces/makefile.inc Sun Feb 12 15:26:02 2006
@@ -172,6 +172,9 @@
EXE_UNIXCL=darkplaces-glx
EXE_UNIXSV=darkplaces-dedicated
EXE_UNIXSDL=darkplaces-sdl
+EXE_UNIXCLNEXUIZ=nexuiz-glx
+EXE_UNIXSVNEXUIZ=nexuiz-dedicated
+EXE_UNIXSDLNEXUIZ=nexuiz-sdl
CMD_UNIXRM=rm -rf
@@ -237,7 +240,7 @@
#if you want no CD audio
#OBJ_WINCD=$(OBJ_NOCD)
-OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
+OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
# Link
LDFLAGS_WINCOMMON=-lwinmm -lwsock32
@@ -247,6 +250,9 @@
EXE_WINCL=darkplaces.exe
EXE_WINSV=darkplaces-dedicated.exe
EXE_WINSDL=darkplaces-sdl.exe
+EXE_WINCLNEXUIZ=nexuiz.exe
+EXE_WINSVNEXUIZ=nexuiz-dedicated.exe
+EXE_WINSDLNEXUIZ=nexuiz-sdl.exe
##### Commands #####
@@ -265,15 +271,19 @@
@echo "* $(MAKE) debug : make client and server binaries (debug versions)"
@echo "* $(MAKE) profile : make client and server binaries (profile versions)"
@echo "* $(MAKE) release : make client and server binaries (release versions)"
+ @echo "* $(MAKE) nexuiz : make client and server binaries with nexuiz icon (release versions)"
@echo "* $(MAKE) cl-debug : make client (debug version)"
@echo "* $(MAKE) cl-profile : make client (profile version)"
@echo "* $(MAKE) cl-release : make client (release version)"
+ @echo "* $(MAKE) cl-nexuiz : make client with nexuiz icon (release version)"
@echo "* $(MAKE) sv-debug : make dedicated server (debug version)"
@echo "* $(MAKE) sv-profile : make dedicated server (profile version)"
@echo "* $(MAKE) sv-release : make dedicated server (release version)"
+ @echo "* $(MAKE) sv-nexuiz : make dedicated server with nexuiz icon (release version)"
@echo "* $(MAKE) sdl-debug : make SDL client (debug version)"
@echo "* $(MAKE) sdl-profile : make SDL client (profile version)"
@echo "* $(MAKE) sdl-release : make SDL client (release version)"
+ @echo "* $(MAKE) sdl-nexuiz : make SDL client with nexuiz icon (release version)"
@echo
debug :
@@ -285,6 +295,9 @@
release :
$(MAKE) sv-release cl-release sdl-release
+nexuiz :
+ $(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz
+
cl-debug :
$(MAKE) bin-debug \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
@@ -300,6 +313,11 @@
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
+cl-nexuiz :
+ $(MAKE) bin-release \
+ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+ EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
+
sv-debug :
$(MAKE) bin-debug \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
@@ -315,6 +333,11 @@
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
+sv-nexuiz :
+ $(MAKE) bin-release \
+ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+ EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
+
sdl-debug :
$(MAKE) bin-debug \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
@@ -330,6 +353,11 @@
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
+sdl-nexuiz :
+ $(MAKE) bin-release \
+ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+ EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
+
bin-debug :
@echo
@echo "========== $(EXE) (debug) =========="
@@ -373,16 +401,28 @@
darkplaces.o: %.o : %.rc
windres -o $@ $<
+nexuiz.o: %.o : %.rc
+ windres -o $@ $<
+
.c.o:
$(DO_CC)
-$(EXE_CL): $(OBJ_CL)
+$(EXE_CL): $(OBJ_CL) $(OBJ_ICON)
+ $(DO_LD)
+
+$(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
+ $(DO_LD)
+
+$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON)
+ $(DO_LD)
+
+$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ)
$(DO_LD)
-$(EXE_SV): $(OBJ_SV)
+$(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
$(DO_LD)
-$(EXE_SDL): $(OBJ_SDL)
+$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
$(DO_LD)
clean:
Index: darkplaces/nexuiz.ico
Index: darkplaces/nexuiz.rc
diff -u /dev/null darkplaces/nexuiz.rc:1.1
--- /dev/null Sun Feb 12 15:26:12 2006
+++ darkplaces/nexuiz.rc Sun Feb 12 15:26:02 2006
@@ -0,0 +1,25 @@
+#include <windows.h> // include for version info constants
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "nexuiz.ico"
+
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILETYPE VFT_APP
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "CompanyName", "Forest Hale Digital Services"
+ VALUE "FileVersion", "1.0"
+ VALUE "FileDescription", "Nexuiz"
+ VALUE "InternalName", "nexuiz.exe"
+ VALUE "LegalCopyright", "id Software, Forest Hale, and contributors"
+ VALUE "LegalTrademarks", ""
+ VALUE "OriginalFilename", "nexuiz.exe"
+ VALUE "ProductName", "Nexuiz"
+ VALUE "ProductVersion", "1.0"
+ }
+ }
+}
More information about the twilight-commits
mailing list