q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-16 17:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add ability to change window dedicated server executable icon

Browse source
This commit is contained in:
zturtleman 2021-03-17 18:29:24 +00:00
parent 317a17b426
commit 89da51f883
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/Makefile
View file

@ -1330,6 +1330,11 @@ $(echo_cmd) "WINDRES $<"
$(Q)$(WINDRES) -i $< -o $@ $(Q)$(WINDRES) -i $< -o $@
endef endef
define DO_DED_WINDRES
$(echo_cmd) "DED_WINDRES $<"
$(Q)$(WINDRES) -DDEDICATED -i $< -o $@
endef
############################################################################# #############################################################################
# MAIN TARGETS # MAIN TARGETS
@ -2829,7 +2834,7 @@ $(B)/ded/%.o: $(SYSDIR)/%.m
$(DO_DED_CC) $(DO_DED_CC)
$(B)/ded/win_resource.o: $(SYSDIR)/win_resource.rc $(SYSDIR)/win_manifest.xml $(B)/ded/win_resource.o: $(SYSDIR)/win_resource.rc $(SYSDIR)/win_manifest.xml
$(DO_WINDRES) $(DO_DED_WINDRES)
$(B)/ded/%.o: $(NDIR)/%.c $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC) $(DO_DED_CC)

8
engine/code/sys/win_resource.rc
View file

@ -53,11 +53,19 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
#ifdef DEDICATED
#ifndef __MINGW32__ #ifndef __MINGW32__
IDI_ICON1 ICON DISCARDABLE "../q3r_icon.ico" IDI_ICON1 ICON DISCARDABLE "../q3r_icon.ico"
#else #else
IDI_ICON1 ICON DISCARDABLE "misc/q3r_icon.ico" IDI_ICON1 ICON DISCARDABLE "misc/q3r_icon.ico"
#endif #endif
#else
#ifndef __MINGW32__
IDI_ICON1 ICON DISCARDABLE "../quake3.ico"
#else
IDI_ICON1 ICON DISCARDABLE "misc/quake3.ico"
#endif
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////