diff --git a/CMakeLists.txt b/CMakeLists.txt index 0714e4ef3..e8caef397 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,8 +455,8 @@ IF("${CPACK_GENERATOR}" STREQUAL "DEB") ENDIF() IF("${CPACK_GENERATOR}" STREQUAL "NSIS") SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest") - SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/glest.ico") - SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/megaglest.ico") + SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/zetaglest.ico") + SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/zetaglest.ico") SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org") ENDIF() diff --git a/mk/macos/make-binary-archive.sh b/mk/macos/make-binary-archive.sh index 90e2cfdfa..216930254 100755 --- a/mk/macos/make-binary-archive.sh +++ b/mk/macos/make-binary-archive.sh @@ -69,7 +69,7 @@ fi cd "$CURRENTDIR" echo "copying binaries ..." 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 {../shared/,}*.ini "$RELEASEDIR" if [ -e "$RELEASEDIR/glest-dev.ini" ]; then rm "$RELEASEDIR/glest-dev.ini"; fi diff --git a/mk/shared/glest.ico b/mk/shared/glest.ico deleted file mode 100644 index 82d89e0c9..000000000 Binary files a/mk/shared/glest.ico and /dev/null differ diff --git a/mk/shared/megaglest.ico b/mk/shared/zetaglest.ico similarity index 100% rename from mk/shared/megaglest.ico rename to mk/shared/zetaglest.ico diff --git a/mk/windows/Installer/MegaGlestInstaller.nsi b/mk/windows/Installer/MegaGlestInstaller.nsi index 8379cfff9..958494fd3 100644 --- a/mk/windows/Installer/MegaGlestInstaller.nsi +++ b/mk/windows/Installer/MegaGlestInstaller.nsi @@ -14,10 +14,10 @@ Name "${APNAME} ${APVER}" SetCompressor /FINAL /SOLID lzma SetCompressorDictSize 64 OutFile "${APNAME}-Installer-${APVER}_windows_XXbit.exe" -Icon "..\..\shared\megaglest.ico" -UninstallIcon "..\..\shared\megaglest.ico" -!define MUI_ICON "..\..\shared\megaglest.ico" -!define MUI_UNICON "..\..\shared\megaglest.ico" +Icon "..\..\shared\zetaglest.ico" +UninstallIcon "..\..\shared\zetaglest.ico" +!define MUI_ICON "..\..\shared\zetaglest.ico" +!define MUI_UNICON "..\..\shared\zetaglest.ico" InstallDir "$PROGRAMFILES\${APNAME}" ShowInstDetails show ;BGGradient 0xDF9437 0xffffff @@ -26,12 +26,12 @@ ShowInstDetails show RequestExecutionLevel none PageEx license - LicenseText "MegaGlest Game License" + LicenseText "ZetaGlest Game License" LicenseData "..\..\..\docs\gnu_gpl_3.0.txt" PageExEnd PageEx license - LicenseText "MegaGlest Data License" + LicenseText "ZetaGlest Data License" LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt" PageExEnd @@ -240,7 +240,7 @@ Section "${APNAME} (required)" File "..\7z.exe" File "..\7z.dll" - File "..\..\shared\megaglest.ico" + File "..\..\shared\zetaglest.ico" File "..\glest.ini" File "..\..\shared\glestkeys.ini" File "..\..\shared\servers.ini" @@ -355,7 +355,7 @@ Section "Uninstall" Delete "$INSTDIR\megaglest_editorx64.exe" Delete "$INSTDIR\megaglest_g3dviewerx64.exe" - Delete "$INSTDIR\megaglest.ico" + Delete "$INSTDIR\zetaglest.ico" Delete "$INSTDIR\glest.ini" Delete "$INSTDIR\glestkeys.ini" Delete "$INSTDIR\servers.ini" diff --git a/mk/windows/Installer/MegaGlestUpdater.nsi b/mk/windows/Installer/MegaGlestUpdater.nsi index 1f24d6e1d..82d899020 100644 --- a/mk/windows/Installer/MegaGlestUpdater.nsi +++ b/mk/windows/Installer/MegaGlestUpdater.nsi @@ -11,10 +11,10 @@ Name "${APNAME} ${APVER_UPDATE}" SetCompressor /FINAL /SOLID lzma SetCompressorDictSize 64 OutFile "${APNAME}-Updater-${APVER_UPDATE}_i386_win32.exe" -Icon "..\megaglest.ico" -UninstallIcon "..\megaglest.ico" -!define MUI_ICON "..\megaglest.ico" -!define MUI_UNICON "..\megaglest.ico" +Icon "..\zetaglest.ico" +UninstallIcon "..\zetaglest.ico" +!define MUI_ICON "..\zetaglest.ico" +!define MUI_UNICON "..\zetaglest.ico" InstallDir "$PROGRAMFILES\${APNAME}_${APVER}" ShowInstDetails show BGGradient 0xDF9437 0xffffff @@ -24,12 +24,12 @@ BGGradient 0xDF9437 0xffffff RequestExecutionLevel none PageEx license - LicenseText "MegaGlest Game License" + LicenseText "ZetaGlest Game License" LicenseData "..\..\..\docs\gnu_gpl_3.0.txt" PageExEnd PageEx license - LicenseText "MegaGlest Data License" + LicenseText "ZetaGlest Data License" LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt" PageExEnd @@ -222,7 +222,7 @@ Section "Uninstall" Delete "$INSTDIR\megaglest.exe" Delete "$INSTDIR\megaglest_editor.exe" Delete "$INSTDIR\megaglest_g3dviewer.exe" - Delete "$INSTDIR\megaglest.ico" + Delete "$INSTDIR\zetaglest.ico" Delete "$INSTDIR\glest.ini" Delete "$INSTDIR\glestkeys.ini" Delete "$INSTDIR\servers.ini" diff --git a/mk/windows/glest.rc b/mk/windows/glest.rc index 40321b219..54189648d 100644 --- a/mk/windows/glest.rc +++ b/mk/windows/glest.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "..\shared\megaglest.ico" +IDI_ICON1 ICON DISCARDABLE "..\shared\zetaglest.ico" diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 06c67c3a7..3ef9f0a10 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -374,7 +374,7 @@ IF(BUILD_MEGAGLEST) ENDIF() INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/shared/megaglest.ico" + "${PROJECT_SOURCE_DIR}/mk/shared/zetaglest.ico" DESTINATION ${MEGAGLEST_INI_INSTALL_PATH}) IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY) INSTALL(FILES diff --git a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp index 2002636c7..219f2065b 100644 --- a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp +++ b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp @@ -261,7 +261,7 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits, delete [] result.second; } - //SDL_Surface *icon = IMG_Load("megaglest.ico"); + //SDL_Surface *icon = IMG_Load("zetaglest.ico"); //#if !defined(MACOSX)