mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 15:41:24 +02:00
Code Issues Projects Releases Wiki Activity

Changed icon name to zetaglest.ico (#88)

Browse Source 
* Changed icon name to zetaglest.ico
This commit is contained in:
MathuSum Mut
2018-03-05 04:20:26 +01:00
committed by Andy Alt
parent d999bc87da
commit ca283f781d
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -455,8 +455,8 @@ IF("${CPACK_GENERATOR}" STREQUAL "DEB")
ENDIF() ENDIF()
IF("${CPACK_GENERATOR}" STREQUAL "NSIS") IF("${CPACK_GENERATOR}" STREQUAL "NSIS")
SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest") SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest")
SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/glest.ico") SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/zetaglest.ico")
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/megaglest.ico") SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/zetaglest.ico")
SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org") SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
ENDIF() ENDIF()

2
mk/macos/make-binary-archive.sh
View File

@@ -69,7 +69,7 @@ fi
cd "$CURRENTDIR" cd "$CURRENTDIR"
echo "copying binaries ..." echo "copying binaries ..."
cp ../shared/*.ico "$RELEASEDIR" cp ../shared/*.ico "$RELEASEDIR"
if [ -e "$RELEASEDIR/glest.ico" ]; then rm "$RELEASEDIR/glest.ico"; fi if [ -e "$RELEASEDIR/zetaglest.ico" ]; then rm "$RELEASEDIR/zetaglest.ico"; fi
#cp bundle_resources/*.icns "$RELEASEDIR" #cp bundle_resources/*.icns "$RELEASEDIR"
cp {../shared/,}*.ini "$RELEASEDIR" cp {../shared/,}*.ini "$RELEASEDIR"
if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm "$RELEASEDIR/glest-dev.ini"; fi if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm "$RELEASEDIR/glest-dev.ini"; fi

BIN
mk/shared/glest.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.2 KiB

0
mk/shared/megaglest.ico → mk/shared/zetaglest.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

16
mk/windows/Installer/MegaGlestInstaller.nsi
View File

@@ -14,10 +14,10 @@ Name "${APNAME} ${APVER}"
SetCompressor /FINAL /SOLID lzma SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64 SetCompressorDictSize 64
OutFile "${APNAME}-Installer-${APVER}_windows_XXbit.exe" OutFile "${APNAME}-Installer-${APVER}_windows_XXbit.exe"
Icon "..\..\shared\megaglest.ico" Icon "..\..\shared\zetaglest.ico"
UninstallIcon "..\..\shared\megaglest.ico" UninstallIcon "..\..\shared\zetaglest.ico"
!define MUI_ICON "..\..\shared\megaglest.ico" !define MUI_ICON "..\..\shared\zetaglest.ico"
!define MUI_UNICON "..\..\shared\megaglest.ico" !define MUI_UNICON "..\..\shared\zetaglest.ico"
InstallDir "$PROGRAMFILES\${APNAME}" InstallDir "$PROGRAMFILES\${APNAME}"
ShowInstDetails show ShowInstDetails show
;BGGradient 0xDF9437 0xffffff ;BGGradient 0xDF9437 0xffffff
@@ -26,12 +26,12 @@ ShowInstDetails show
RequestExecutionLevel none RequestExecutionLevel none
PageEx license PageEx license
LicenseText "MegaGlest Game License" LicenseText "ZetaGlest Game License"
LicenseData "..\..\..\docs\gnu_gpl_3.0.txt" LicenseData "..\..\..\docs\gnu_gpl_3.0.txt"
PageExEnd PageExEnd
PageEx license PageEx license
LicenseText "MegaGlest Data License" LicenseText "ZetaGlest Data License"
LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt" LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt"
PageExEnd PageExEnd
@@ -240,7 +240,7 @@ Section "${APNAME} (required)"
File "..\7z.exe" File "..\7z.exe"
File "..\7z.dll" File "..\7z.dll"
File "..\..\shared\megaglest.ico" File "..\..\shared\zetaglest.ico"
File "..\glest.ini" File "..\glest.ini"
File "..\..\shared\glestkeys.ini" File "..\..\shared\glestkeys.ini"
File "..\..\shared\servers.ini" File "..\..\shared\servers.ini"
@@ -355,7 +355,7 @@ Section "Uninstall"
Delete "$INSTDIR\megaglest_editorx64.exe" Delete "$INSTDIR\megaglest_editorx64.exe"
Delete "$INSTDIR\megaglest_g3dviewerx64.exe" Delete "$INSTDIR\megaglest_g3dviewerx64.exe"
Delete "$INSTDIR\megaglest.ico" Delete "$INSTDIR\zetaglest.ico"
Delete "$INSTDIR\glest.ini" Delete "$INSTDIR\glest.ini"
Delete "$INSTDIR\glestkeys.ini" Delete "$INSTDIR\glestkeys.ini"
Delete "$INSTDIR\servers.ini" Delete "$INSTDIR\servers.ini"

14
mk/windows/Installer/MegaGlestUpdater.nsi
View File

@@ -11,10 +11,10 @@ Name "${APNAME} ${APVER_UPDATE}"
SetCompressor /FINAL /SOLID lzma SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64 SetCompressorDictSize 64
OutFile "${APNAME}-Updater-${APVER_UPDATE}_i386_win32.exe" OutFile "${APNAME}-Updater-${APVER_UPDATE}_i386_win32.exe"
Icon "..\megaglest.ico" Icon "..\zetaglest.ico"
UninstallIcon "..\megaglest.ico" UninstallIcon "..\zetaglest.ico"
!define MUI_ICON "..\megaglest.ico" !define MUI_ICON "..\zetaglest.ico"
!define MUI_UNICON "..\megaglest.ico" !define MUI_UNICON "..\zetaglest.ico"
InstallDir "$PROGRAMFILES\${APNAME}_${APVER}" InstallDir "$PROGRAMFILES\${APNAME}_${APVER}"
ShowInstDetails show ShowInstDetails show
BGGradient 0xDF9437 0xffffff BGGradient 0xDF9437 0xffffff
@@ -24,12 +24,12 @@ BGGradient 0xDF9437 0xffffff
RequestExecutionLevel none RequestExecutionLevel none
PageEx license PageEx license
LicenseText "MegaGlest Game License" LicenseText "ZetaGlest Game License"
LicenseData "..\..\..\docs\gnu_gpl_3.0.txt" LicenseData "..\..\..\docs\gnu_gpl_3.0.txt"
PageExEnd PageExEnd
PageEx license PageEx license
LicenseText "MegaGlest Data License" LicenseText "ZetaGlest Data License"
LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt" LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt"
PageExEnd PageExEnd
@@ -222,7 +222,7 @@ Section "Uninstall"
Delete "$INSTDIR\megaglest.exe" Delete "$INSTDIR\megaglest.exe"
Delete "$INSTDIR\megaglest_editor.exe" Delete "$INSTDIR\megaglest_editor.exe"
Delete "$INSTDIR\megaglest_g3dviewer.exe" Delete "$INSTDIR\megaglest_g3dviewer.exe"
Delete "$INSTDIR\megaglest.ico" Delete "$INSTDIR\zetaglest.ico"
Delete "$INSTDIR\glest.ini" Delete "$INSTDIR\glest.ini"
Delete "$INSTDIR\glestkeys.ini" Delete "$INSTDIR\glestkeys.ini"
Delete "$INSTDIR\servers.ini" Delete "$INSTDIR\servers.ini"

2
mk/windows/glest.rc
View File

@@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "..\shared\megaglest.ico" IDI_ICON1 ICON DISCARDABLE "..\shared\zetaglest.ico"

2
source/glest_game/CMakeLists.txt
View File

@@ -374,7 +374,7 @@ IF(BUILD_MEGAGLEST)
ENDIF() ENDIF()
INSTALL(FILES INSTALL(FILES
"${PROJECT_SOURCE_DIR}/mk/shared/megaglest.ico" "${PROJECT_SOURCE_DIR}/mk/shared/zetaglest.ico"
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH}) DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY) IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
INSTALL(FILES INSTALL(FILES

2
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -261,7 +261,7 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,
delete [] result.second; delete [] result.second;
} }
//SDL_Surface *icon = IMG_Load("megaglest.ico"); //SDL_Surface *icon = IMG_Load("zetaglest.ico");
//#if !defined(MACOSX) //#if !defined(MACOSX)