zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert recent icon changes. 

git-svn-id: https://svn.eduke32.com/eduke32@5253 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-05-27 08:46:44 +00:00
parent f4ab5ec448
commit b7b23310e3
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
polymer/eduke32/Makefile
View File

@ -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

5
polymer/eduke32/Makefile.deps
View File

@ -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

4
polymer/eduke32/Makefile.msvc
View File

@ -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")

1
polymer/eduke32/rsrc/build_icon.c Normal file
View File

@ -0,0 +1 @@
#include "eduke32_icon.c"

BIN
polymer/eduke32/rsrc/build_icon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

1
polymer/eduke32/rsrc/game_icon.c Normal file
View File

@ -0,0 +1 @@
#include "eduke32_icon.c"

4
polymer/eduke32/source/misc/buildres.rc
View File

@ -2,7 +2,7 @@
#include <commctrl.h>
#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"

2
polymer/eduke32/source/misc/gameres.rc
View File

@ -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"