Merge remote-tracking branch 'origin/master' into wip/darwin

2024-12-30 10:15:36 +01:00 · 2017-07-30 21:31:45 +02:00 · 2017-07-30 21:31:45 +02:00 · 9b72cc0810
commit 9b72cc0810
parent 512bf0d6f6 9013032ce5
16 changed files with 2779 additions and 812 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -53,7 +53,7 @@ file (COPY resources/image DESTINATION share/planetblupi)
 file (COPY resources/movie DESTINATION share/planetblupi)
 file (COPY resources/sound DESTINATION share/planetblupi)
 file (COPY resources/music DESTINATION share/planetblupi)
-file (COPY resources/icon/planetblupi.png DESTINATION share/planetblupi)
+file (COPY resources/icon/blupi-256.png DESTINATION share/planetblupi)
 # Windows stuff
@ -156,7 +156,7 @@ install (DIRECTORY resources/image DESTINATION share/planetblupi)
 install (DIRECTORY resources/movie DESTINATION share/planetblupi)
 install (DIRECTORY resources/sound DESTINATION share/planetblupi)
 install (DIRECTORY resources/music DESTINATION share/planetblupi)
-install (FILES resources/icon/planetblupi.png DESTINATION share/planetblupi)
+install (FILES resources/icon/blupi-256.png DESTINATION share/planetblupi)
 # Copy libwinpthread-1.dll which seems not be linkable statically
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND MINGW)
--- a/resources/icon/blupi-128.png
+++ b/resources/icon/blupi-128.png
--- a/resources/icon/blupi-16.png
+++ b/resources/icon/blupi-16.png
--- a/resources/icon/blupi-256.png
+++ b/resources/icon/blupi-256.png
--- a/resources/icon/blupi-32.png
+++ b/resources/icon/blupi-32.png
--- a/resources/icon/blupi-48.png
+++ b/resources/icon/blupi-48.png
--- a/resources/icon/blupi-512.png
+++ b/resources/icon/blupi-512.png
--- a/resources/icon/blupi-64.png
+++ b/resources/icon/blupi-64.png
--- a/resources/icon/blupi.ico
+++ b/resources/icon/blupi.ico
--- a/resources/icon/blupi.svg
+++ b/resources/icon/blupi.svg
--- a/resources/icon/planetblupi.png
+++ b/resources/icon/planetblupi.png
--- a/resources/linux/icon.svg
+++ b/resources/linux/icon.svg
--- a/resources/win32/blupi.ico
+++ b/resources/win32/blupi.ico
--- a/resources/win32/planetblupi.ico
+++ b/resources/win32/planetblupi.ico
--- a/resources/win32/planetblupi.rc
+++ b/resources/win32/planetblupi.rc
@ -1 +1 @@
-id ICON "planetblupi.ico"
+id ICON "blupi.ico"
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@ -405,7 +405,7 @@ static bool DoInit (Sint32 argc, char *argv[])
        return false;
    }
-    auto icon = IMG_Load ((GetBaseDir () + "planetblupi.png").c_str ());
+    auto icon = IMG_Load ((GetBaseDir () + "blupi-256.png").c_str ());
    SDL_SetWindowIcon (g_window, icon);
    SDL_FreeSurface (icon);
`@ -1 +1 @@`
	`id ICON "planetblupi.ico"`	`id ICON "blupi.ico"`