Merge pull request #9600 from Bonta0/mgba-pr

Full GBA Controllers Integration with mGBA

Source/Core/Common/CommonPaths.h

@@ -34,6 +34,7 @@
 
 // Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
 #define GC_USER_DIR "GC"
+#define GBA_USER_DIR "GBA"
 #define WII_USER_DIR "Wii"
 #define CONFIG_DIR "Config"
 #define GAMESETTINGS_DIR "GameSettings"
@@ -61,6 +62,7 @@
 #define RESOURCES_DIR "Resources"
 #define THEMES_DIR "Themes"
 #define STYLES_DIR "Styles"
+#define GBASAVES_DIR "Saves"
 #define ANAGLYPH_DIR "Anaglyph"
 #define PASSIVE_DIR "Passive"
 #define PIPES_DIR "Pipes"
@@ -119,6 +121,9 @@
 #define GC_MEMCARDB "MemoryCardB"
 #define GC_MEMCARD_NETPLAY "NetPlayTemp"
 
+#define GBA_BIOS "gba_bios.bin"
+#define GBA_SAVE_NETPLAY "NetPlayTemp"
+
 #define WII_STATE "state.dat"
 
 #define WII_SDCARD "sd.raw"

Source/Core/Common/FileUtil.cpp

@@ -977,6 +977,10 @@ static void RebuildUserDirectories(unsigned int dir_index)
     s_user_paths[F_MEMORYWATCHERSOCKET_IDX] =
         s_user_paths[D_MEMORYWATCHER_IDX] + MEMORYWATCHER_SOCKET;
 
+    s_user_paths[D_GBAUSER_IDX] = s_user_paths[D_USER_IDX] + GBA_USER_DIR DIR_SEP;
+    s_user_paths[D_GBASAVES_IDX] = s_user_paths[D_GBAUSER_IDX] + GBASAVES_DIR DIR_SEP;
+    s_user_paths[F_GBABIOS_IDX] = s_user_paths[D_GBAUSER_IDX] + GBA_BIOS;
+
     // The shader cache has moved to the cache directory, so remove the old one.
     // TODO: remove that someday.
     File::DeleteDirRecursively(s_user_paths[D_USER_IDX] + SHADERCACHE_LEGACY_DIR DIR_SEP);

Source/Core/Common/FileUtil.h

@@ -59,6 +59,8 @@ enum
   D_BACKUP_IDX,
   D_RESOURCEPACK_IDX,
   D_DYNAMICINPUT_IDX,
+  D_GBAUSER_IDX,
+  D_GBASAVES_IDX,
   F_DOLPHINCONFIG_IDX,
   F_GCPADCONFIG_IDX,
   F_WIIPADCONFIG_IDX,
@@ -77,6 +79,7 @@ enum
   F_WIISDCARD_IDX,
   F_DUALSHOCKUDPCLIENTCONFIG_IDX,
   F_FREELOOKCONFIG_IDX,
+  F_GBABIOS_IDX,
   NUM_PATH_INDICES
 };
 

Source/Core/Common/SCMRevGen.vcxproj

@@ -35,10 +35,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\VSProps\Base.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CScript Condition="'$(ProgramFiles(x86))' != ''">%windir%\System32\cscript</CScript>
-    <CScript Condition="'$(ProgramFiles(x86))' == ''">%windir%\Sysnative\cscript</CScript>
-  </PropertyGroup>
   <!--
     OutDir is always created, which is annoying for SCMRevGen as it doesn't really have an outdir.
     Here it's redirected to some other place to hide the annoyance.