Merge pull request #99 from savaughn/app-icons

Added app icons

.github/workflows/build-macos.yml

@@ -128,8 +128,9 @@ jobs:
         cp "${{ github.workspace }}/pokeromtrader" "${MACOS_DESTINATION}/pokeromtrader"
 
         # Copy assets
-        mkdir -p "${MACOS_DESTINATION}/../Resources"
-        cp -r "${{ github.workspace }}/assets" "${MACOS_DESTINATION}/../Resources"
+        mkdir -p "${MACOS_DESTINATION}/../Resources/assets"
+        cp -r "${{ github.workspace }}/assets/images" "${MACOS_DESTINATION}/../Resources/assets"
+        cp "${{ github.workspace }}/assets/icon.icns" "${MACOS_DESTINATION}/../Resources"
         
         # Create Info.plist file
         echo '<?xml version="1.0" encoding="UTF-8"?>' > "${INFO_PLIST}"
@@ -142,6 +143,8 @@ jobs:
         echo "    <string>${APP_BUNDLE_ID}</string>" >> "${INFO_PLIST}"
         echo '    <key>CFBundleName</key>' >> "${INFO_PLIST}"
         echo "    <string>${APP_BUNDLE_NAME}</string>" >> "${INFO_PLIST}"
+        echo "    <key>CFBundleIconFile</key>" >> "${INFO_PLIST}"
+        echo "    <string>icon</string>" >> "${INFO_PLIST}"
         echo '</dict>' >> "${INFO_PLIST}"
         echo '</plist>' >> "${INFO_PLIST}"
         
@@ -184,8 +187,9 @@ jobs:
         cp "${{ github.workspace }}/pokeromtrader" "${MACOS_DESTINATION}/pokeromtrader"
 
         # Copy assets
-        mkdir -p "${MACOS_DESTINATION}/../Resources"
-        cp -r "${{ github.workspace }}/assets" "${MACOS_DESTINATION}/../Resources"
+        mkdir -p "${MACOS_DESTINATION}/../Resources/assets"
+        cp -r "${{ github.workspace }}/assets/images" "${MACOS_DESTINATION}/../Resources/assets"
+        cp "${{ github.workspace }}/assets/icon.icns" "${MACOS_DESTINATION}/../Resources"
         
         # Create Info.plist file
         echo '<?xml version="1.0" encoding="UTF-8"?>' > "${INFO_PLIST}"
@@ -198,6 +202,8 @@ jobs:
         echo "    <string>${APP_BUNDLE_ID}</string>" >> "${INFO_PLIST}"
         echo '    <key>CFBundleName</key>' >> "${INFO_PLIST}"
         echo "    <string>${APP_BUNDLE_NAME}</string>" >> "${INFO_PLIST}"
+        echo "    <key>CFBundleIconFile</key>" >> "${INFO_PLIST}"
+        echo "    <string>icon</string>" >> "${INFO_PLIST}"
         echo '</dict>' >> "${INFO_PLIST}"
         echo '</plist>' >> "${INFO_PLIST}"
         

.gitignore

@@ -15,7 +15,7 @@
 build/*
 deps/pksav/build/
 obj/
-*.DS_Store
+.DS_Store
 src/pokeromtrader
 
 tests/*

Makefile

@@ -30,9 +30,9 @@ PLATFORM              ?= PLATFORM_DESKTOP
 
 # Define project variables
 PROJECT_NAME          ?= pokeromtrader
-PROJECT_VERSION       := 0.7.0
+PROJECT_VERSION       := 0.8.0
 # prerelease or release
-PROJECT_VERSION_TYPE  ?= release
+PROJECT_VERSION_TYPE  ?= prerelease
 PROJECT_BUILD_PATH    ?= .
 
 RAYLIB_PATH           ?= deps/raylib
@@ -261,7 +261,7 @@ LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src -Ldeps/pksav/build/l
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # NOTE: The resource .rc file contains windows executable icon and properties
-        # LDFLAGS += \deps\pksav\build\lib\
+        LDFLAGS += assets\pkrom.rc.data
         # -Wl,--subsystem,windows hides the console window
         ifeq ($(BUILD_MODE), RELEASE)
             LDFLAGS += -Wl,--subsystem,windows

assets/pkrom.rc

@@ -0,0 +1,21 @@
+GLFW_ICON ICON "icon.ico"
+
+1 VERSIONINFO
+FILEVERSION     4,5,0,0
+PRODUCTVERSION  4,5,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+	//BLOCK "080904E4" 	// English UK
+    BLOCK "040904E4"	// English US
+    BEGIN
+      VALUE "InternalName", "pokeromtrader app"
+      VALUE "OriginalFilename", "PokeromTrader.exe"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+	//VALUE "Translation", 0x809, 1252	// English UK
+    VALUE "Translation", 0x409, 1252	// English US
+  END
+END