added nexuiz icon and make rules to make use of it, and now the icon is included...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5977 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/makefile b/makefile
index e5d8ce82880041865c1647660de2fddf3dc12de9..e563564dc8e6aaea030f7b38049f427ab895dd35 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
+#####  DP_MAKE_TARGET autodetection and arch specific variables #####

 
 ifndef DP_MAKE_TARGET
 
 
 ifndef DP_MAKE_TARGET
 


@@ -54,6 +54,8 @@ ifeq ($(DP_MAKE_TARGET), linux)
        OBJ_CD=$(OBJ_LINUXCD)
 
        OBJ_CL=$(OBJ_GLX)
        OBJ_CD=$(OBJ_LINUXCD)
 
        OBJ_CL=$(OBJ_GLX)

+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=

 
        LDFLAGS_CL=$(LDFLAGS_LINUXCL)
        LDFLAGS_SV=$(LDFLAGS_LINUXSV)
 
        LDFLAGS_CL=$(LDFLAGS_LINUXCL)
        LDFLAGS_SV=$(LDFLAGS_LINUXSV)


@@ -62,6 +64,9 @@ ifeq ($(DP_MAKE_TARGET), linux)
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        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
 endif
 
 # Mac OS X configuration


@@ -70,6 +75,8 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        OBJ_CD=$(OBJ_MACOSXCD)
 
        OBJ_CL=$(OBJ_AGL)
        OBJ_CD=$(OBJ_MACOSXCD)
 
        OBJ_CL=$(OBJ_AGL)

+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=

 
        LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
        LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
 
        LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
        LDFLAGS_SV=$(LDFLAGS_MACOSXSV)


@@ -78,6 +85,9 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        EXE_CL=$(EXE_MACOSXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        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)
 endif
 
 # SunOS configuration (Solaris)


@@ -86,6 +96,8 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        OBJ_CD=$(OBJ_SUNOSCD)
 
        OBJ_CL=$(OBJ_GLX)
        OBJ_CD=$(OBJ_SUNOSCD)
 
        OBJ_CL=$(OBJ_GLX)

+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=

 
        CFLAGS_EXTRA=$(CFLAGS_SUNOS)
 
 
        CFLAGS_EXTRA=$(CFLAGS_SUNOS)
 


@@ -96,6 +108,9 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        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
 endif
 
 # BSD configuration


@@ -108,6 +123,8 @@ endif
        OBJ_CD=$(OBJ_BSDCD)
 
        OBJ_CL=$(OBJ_GLX)
        OBJ_CD=$(OBJ_BSDCD)
 
        OBJ_CL=$(OBJ_GLX)

+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=

 
        LDFLAGS_CL=$(LDFLAGS_BSDCL)
        LDFLAGS_SV=$(LDFLAGS_BSDSV)
 
        LDFLAGS_CL=$(LDFLAGS_BSDCL)
        LDFLAGS_SV=$(LDFLAGS_BSDSV)


@@ -116,6 +133,9 @@ endif
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        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
 endif
 
 # Win32 configuration


@@ -124,6 +144,8 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        OBJ_CD=$(OBJ_WINCD)
 
        OBJ_CL=$(OBJ_WGL)
        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)
 
        LDFLAGS_CL=$(LDFLAGS_WINCL)
        LDFLAGS_SV=$(LDFLAGS_WINSV)


@@ -132,6 +154,9 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_CL=$(EXE_WINCL)
        EXE_SV=$(EXE_WINSV)
        EXE_SDL=$(EXE_WINSDL)
        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
 
 
 endif
 
 

diff --git a/makefile.bsd b/makefile.bsd
index af0228e83a1edc070a95b123c77209694928e9a7..86c5d28f9922f3d5f4ab726932c88732abd88536 100644 (file)
--- a/makefile.bsd
+++ b/makefile.bsd
@@ -1,4 +1,4 @@
-#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
+#####  DP_MAKE_TARGET autodetection and arch specific variables #####

 
 .ifndef DP_MAKE_TARGET
 
 
 .ifndef DP_MAKE_TARGET
 


@@ -25,6 +25,8 @@ DEFAULT_SNDAPI=BSD
 OBJ_CD=$(OBJ_BSDCD)
 
 OBJ_CL=$(OBJ_GLX)
 OBJ_CD=$(OBJ_BSDCD)
 
 OBJ_CL=$(OBJ_GLX)

+OBJ_ICON=
+OBJ_ICON_NEXUIZ=

 
 LDFLAGS_CL=$(LDFLAGS_BSDCL)
 LDFLAGS_SV=$(LDFLAGS_BSDSV)
 
 LDFLAGS_CL=$(LDFLAGS_BSDCL)
 LDFLAGS_SV=$(LDFLAGS_BSDSV)


@@ -32,6 +34,9 @@ LDFLAGS_SV=$(LDFLAGS_BSDSV)
 EXE_CL=$(EXE_UNIXCL)
 EXE_SV=$(EXE_UNIXSV)
 EXE_SDL=$(EXE_UNIXSDL)
 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
 
 
 .endif
 

diff --git a/makefile.inc b/makefile.inc
index 7354784eb730b8e07b8bb9f36414b07c9b679130..d97df1452ddfd3286c7dda655fd7880108759785 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -172,6 +172,9 @@ LDFLAGS_UNIXSDL=`sdl-config --libs`
 EXE_UNIXCL=darkplaces-glx
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
 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
 
 
 CMD_UNIXRM=rm -rf
 


@@ -237,7 +240,7 @@ OBJ_WINCD=cd_win.o
 #if you want no CD audio
 #OBJ_WINCD=$(OBJ_NOCD)
 
 #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
 
 # Link
 LDFLAGS_WINCOMMON=-lwinmm -lwsock32


@@ -247,6 +250,9 @@ LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs`
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
 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 #####
 
 
 ##### Commands #####


@@ -265,15 +271,19 @@ help:
        @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) 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-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-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-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 :
        @echo
 
 debug :


@@ -285,6 +295,9 @@ profile :
 release :
        $(MAKE) sv-release cl-release sdl-release
 
 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) \
 cl-debug :
        $(MAKE) bin-debug \
                DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \


@@ -300,6 +313,11 @@ cl-release :
                DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
                EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
 
                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) \
 sv-debug :
        $(MAKE) bin-debug \
                DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \


@@ -315,6 +333,11 @@ sv-release :
                DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
                EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
 
                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) \
 sdl-debug :
        $(MAKE) bin-debug \
                DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \


@@ -330,6 +353,11 @@ sdl-release :
                DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
                EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
 
                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) =========="
 bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="


@@ -373,16 +401,28 @@ cd_sdl.o: cd_sdl.c
 darkplaces.o: %.o : %.rc
        windres -o $@ $<
 
 darkplaces.o: %.o : %.rc
        windres -o $@ $<
 

+nexuiz.o: %.o : %.rc
+       windres -o $@ $<
+

 .c.o:
        $(DO_CC)
 
 .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)
 
        $(DO_LD)
 

-$(EXE_SV): $(OBJ_SV)
+$(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)

        $(DO_LD)
 
        $(DO_LD)
 

-$(EXE_SDL): $(OBJ_SDL)
+$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)

        $(DO_LD)
 
 clean:
        $(DO_LD)
 
 clean:

diff --git a/nexuiz.ico b/nexuiz.ico
new file mode 100644 (file)
index 0000000..e947fb3
Binary files /dev/null and b/nexuiz.ico differ

diff --git a/nexuiz.rc b/nexuiz.rc
new file mode 100644 (file)
index 0000000..1de8695
--- /dev/null
+++ b/nexuiz.rc
@@ -0,0 +1,25 @@
+#include <windows.h> // include for version info constants\r
+\r
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "nexuiz.ico"\r
+\r
+1 VERSIONINFO\r
+FILEVERSION 1,0,0,0\r
+PRODUCTVERSION 1,0,0,0\r
+FILETYPE VFT_APP\r
+{\r
+  BLOCK "StringFileInfo"\r
+        {\r
+                BLOCK "040904E4"\r
+                {\r
+                        VALUE "CompanyName", "Forest Hale Digital Services"\r
+                        VALUE "FileVersion", "1.0"\r
+                        VALUE "FileDescription", "Nexuiz"\r
+                        VALUE "InternalName", "nexuiz.exe"\r
+                        VALUE "LegalCopyright", "id Software, Forest Hale, and contributors"\r
+                        VALUE "LegalTrademarks", ""\r
+                        VALUE "OriginalFilename", "nexuiz.exe"\r
+                        VALUE "ProductName", "Nexuiz"\r
+                        VALUE "ProductVersion", "1.0"\r
+                }\r
+        }\r
+}\r