Accomodate MK assets

assets/meson.build

@@ -1,6 +1,10 @@
-embedded_assets = [
-    'icon.png'
-]
+embedded_assets = []
+
+if get_option('mk') == true
+    embedded_assets += 'icon_mk.png'
+else
+    embedded_assets += 'icon.png'
+endif
 
 if get_option('cjk_fallback_font') == true
     embedded_assets += 'wqymicrohei.ttf'

macos/meson.build

@@ -1,4 +1,9 @@
-install_data('icon.icns', install_dir: 'Contents/Resources')
+if get_option('mk') == false
+    install_data('icon.icns', install_dir: 'Contents/Resources')
+else
+    install_data('icon_mk.icns', install_dir: 'Contents/Resources', rename: 'icon.icns')
+endif
+
 install_data('Info.plist', install_dir: 'Contents')
 
 meson.add_install_script('macpack.sh')

src/discordstate.cpp

@@ -108,6 +108,7 @@ int discordTryConnect(DiscordStatePrivate *p)
     p->connected = true;
     
     memset(&p->defaultActivity, 0, sizeof(DiscordActivity));
+#ifndef MARIN
     strncpy((char*)&p->defaultActivity.details, p->threadData->config.game.title.c_str(), 128);
     p->defaultActivity.timestamps.start = p->startTime;
     
@@ -116,9 +117,16 @@ int discordTryConnect(DiscordStatePrivate *p)
         strncpy((char*)&p->defaultActivity.assets.large_image, "default", 128);
         strncpy((char*)&p->defaultActivity.assets.large_text, "mkxp-z", 128);
     }
+#else
+    p->defaultActivity.timestamps.start = p->startTime;
     
+    if (p->params.client_id == DEFAULT_CLIENT_ID)
+    {
+        strncpy((char*)&p->defaultActivity.assets.large_image, "default", 128);
+        strncpy((char*)&p->defaultActivity.assets.large_text, "MK", 128);
+    }
+#endif
     p->app.activities->update_activity(p->app.activities, &p->defaultActivity, 0, defaultActivityCb);
-    
     return rc;
 }
 

src/discordstate.h

@@ -4,8 +4,11 @@
 #include <string>
 
 #include "bitmap.h"
-
+#ifdef MARIN
+#define DEFAULT_CLIENT_ID 624284820201013248
+#else
 #define DEFAULT_CLIENT_ID 618672572183347211
+#endif
 
 struct DiscordStatePrivate;
 

src/main.cpp

@@ -45,7 +45,11 @@
 #include <Winsock2.h>
 #endif
 
+#ifdef MARIN
+#include "icon_mk.png.xxd"
+#else
 #include "icon.png.xxd"
+#endif
 
 static void
 rgssThreadError(RGSSThreadData *rtData, const std::string &msg)
@@ -179,7 +183,11 @@ static void setupWindowIcon(const Config &conf, SDL_Window *win)
 	SDL_RWops *iconSrc;
 
 	if (conf.iconPath.empty())
+#ifdef MARIN
+        iconSrc = SDL_RWFromConstMem(___assets_icon_mk_png, ___assets_icon_mk_png_len);
+#else
 		iconSrc = SDL_RWFromConstMem(___assets_icon_png, ___assets_icon_png_len);
+#endif
 	else
 		iconSrc = SDL_RWFromFile(conf.iconPath.c_str(), "rb");
 

windows/meson.build

@@ -1,5 +1,15 @@
 win = import('windows')
 
+conf_data = configuration_data()
+
+if get_option('mk') == true
+    conf_data.set('icon', 'icon_mk')
+else
+    conf_data.set('icon', 'icon')
+endif
+
+configure_file(input: 'resource.rc.in', output: 'resource.rc', configuration: conf_data)
+
 res = files(
 'resource.h',
 'icon.ico',

windows/resource.rc.in

@@ -1,7 +1,7 @@
 #include <windows.h>
 #include "resource.h"
 
-IDI_APPICON ICON "icon.ico"
+IDI_APPICON ICON "@icon@"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION    1,1,0,0