diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 13e8aa257..2d3b5ee1d 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -339,8 +339,8 @@ ifeq ($(RENDERTYPE),SDL) DUKE3D_EDITOR_OBJS+= build_banner endif - DUKE3D_OBJS+= eduke32_icon - DUKE3D_EDITOR_OBJS+= eduke32_icon + DUKE3D_OBJS+= game_icon + DUKE3D_EDITOR_OBJS+= build_icon endif ifeq ($(MIXERTYPE),SDL) MIDI_OBJS=sdlmusic diff --git a/polymer/eduke32/Makefile.deps b/polymer/eduke32/Makefile.deps index 636665383..7d5f88799 100644 --- a/polymer/eduke32/Makefile.deps +++ b/polymer/eduke32/Makefile.deps @@ -105,11 +105,12 @@ $(DUKE3D_OBJ)/m32vars.$o: $(DUKE3D_SRC)/m32vars.c $(DUKE3D_SRC)/m32structures.c # TODO: m32common.c # misc objects -$(DUKE3D_OBJ)/eduke32_icon.$o: $(DUKE3D_RSRC)/eduke32_icon.c +$(DUKE3D_OBJ)/game_icon.$o: $(DUKE3D_RSRC)/game_icon.c +$(DUKE3D_OBJ)/build_icon.$o: $(DUKE3D_RSRC)/build_icon.c $(DUKE3D_OBJ)/grpscan.$o: $(DUKE3D_SRC)/grpscan.c $(ENGINE_INC)/compat.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/scriptfile.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/crc32.h $(DUKE3D_INC)/grpscan.h $(DUKE3D_OBJ)/gameres.$o: $(DUKE3D_SRC)/misc/gameres.rc $(DUKE3D_SRC)/startwin.game.h $(DUKE3D_RSRC)/game.bmp $(DUKE3D_RSRC)/game_icon.ico -$(DUKE3D_OBJ)/buildres.$o: $(DUKE3D_SRC)/misc/buildres.rc $(ENGINE_INC)/startwin.editor.h $(DUKE3D_RSRC)/build.bmp $(DUKE3D_RSRC)/game_icon.ico +$(DUKE3D_OBJ)/buildres.$o: $(DUKE3D_SRC)/misc/buildres.rc $(ENGINE_INC)/startwin.editor.h $(DUKE3D_RSRC)/build.bmp $(DUKE3D_RSRC)/build_icon.ico $(DUKE3D_OBJ)/startwin.game.$o: $(DUKE3D_SRC)/startwin.game.c $(duke3d_h) $(ENGINE_INC)/build.h $(ENGINE_INC)/winlayer.h $(ENGINE_INC)/compat.h $(DUKE3D_INC)/grpscan.h $(DUKE3D_OBJ)/startgtk.game.$o: $(DUKE3D_SRC)/startgtk.game.c $(duke3d_h) $(ENGINE_INC)/dynamicgtk.h $(ENGINE_INC)/build.h $(ENGINE_INC)/baselayer.h $(ENGINE_INC)/compat.h diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc index b7cf62956..9d2c59934 100644 --- a/polymer/eduke32/Makefile.msvc +++ b/polymer/eduke32/Makefile.msvc @@ -242,8 +242,8 @@ ENGINE_OBJS=$(ENGINE_OBJS) $(ENGINE_OBJ)\winlayer.$o $(ENGINE_OBJ)\rawinput.$o !endif !if ("$(RENDERTYPE)"=="SDL") ENGINE_OBJS=$(ENGINE_OBJS) $(ENGINE_OBJ)\sdlayer.$o -DUKE3D_OBJS=$(DUKE3D_OBJS) $(DUKE3D_OBJ)\eduke32_icon.$o -DUKE3D_EDITOR_OBJS=$(DUKE3D_EDITOR_OBJS) $(DUKE3D_OBJ)\eduke32_icon.$o +DUKE3D_OBJS=$(DUKE3D_OBJS) $(DUKE3D_OBJ)\game_icon.$o +DUKE3D_EDITOR_OBJS=$(DUKE3D_EDITOR_OBJS) $(DUKE3D_OBJ)\build_icon.$o !endif !if ("$(MIXERTYPE)"=="WIN") diff --git a/polymer/eduke32/rsrc/build_icon.c b/polymer/eduke32/rsrc/build_icon.c new file mode 100644 index 000000000..a9b6fe43b --- /dev/null +++ b/polymer/eduke32/rsrc/build_icon.c @@ -0,0 +1 @@ +#include "eduke32_icon.c" diff --git a/polymer/eduke32/rsrc/build_icon.ico b/polymer/eduke32/rsrc/build_icon.ico new file mode 100644 index 000000000..0bfa7fb2c Binary files /dev/null and b/polymer/eduke32/rsrc/build_icon.ico differ diff --git a/polymer/eduke32/rsrc/game_icon.c b/polymer/eduke32/rsrc/game_icon.c new file mode 100644 index 000000000..a9b6fe43b --- /dev/null +++ b/polymer/eduke32/rsrc/game_icon.c @@ -0,0 +1 @@ +#include "eduke32_icon.c" diff --git a/polymer/eduke32/source/misc/buildres.rc b/polymer/eduke32/source/misc/buildres.rc index 6af465247..1d3e77b01 100644 --- a/polymer/eduke32/source/misc/buildres.rc +++ b/polymer/eduke32/source/misc/buildres.rc @@ -2,7 +2,7 @@ #include #include "startwin.editor.h" -RSRC_ICON ICON "game_icon.ico" +RSRC_ICON ICON "build_icon.ico" RSRC_BMP BITMAP "build.bmp" WIN_STARTWIN DIALOGEX DISCARDABLE 20, 40, 260, 200 @@ -56,7 +56,7 @@ BEGIN VALUE "FileDescription", "Mapster32 for EDuke32" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "Mapster32" - VALUE "LegalCopyright", "Copyright © 2014 Voidpoint, LLC, 1996, 2003 3D Realms Entertainment" + VALUE "LegalCopyright", "Copyright © 2015 EDuke32 Developers, 1996, 2003 3D Realms Entertainment" VALUE "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Gearbox Software, LLC." VALUE "OriginalFilename", "mapster32.exe" VALUE "ProductName", "Mapster32" diff --git a/polymer/eduke32/source/misc/gameres.rc b/polymer/eduke32/source/misc/gameres.rc index f1f09a406..1c48b3f13 100644 --- a/polymer/eduke32/source/misc/gameres.rc +++ b/polymer/eduke32/source/misc/gameres.rc @@ -64,7 +64,7 @@ BEGIN VALUE "FileDescription", "EDuke32" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "EDuke32" - VALUE "LegalCopyright", "Copyright © 2014 Voidpoint, LLC, 1996, 2003 3D Realms Entertainment" + VALUE "LegalCopyright", "Copyright © 2015 EDuke32 Developers, 1996, 2003 3D Realms Entertainment" VALUE "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Gearbox Software, LLC." VALUE "OriginalFilename", "eduke32.exe" VALUE "ProductName", "EDuke32"