feat: infer game path from compile target

Author: Poggicek

src/main/CMakeLists.txt

@@ -6,7 +6,7 @@ file(GLOB_RECURSE HEADERS_LIST
   "*.h"
 )
 
-function(BUILD_GAME GAME)
+function(BUILD_GAME GAME GAME_PATH)
   add_executable(DumpSource2-${GAME} ${SOURCES_LIST} ${HEADERS_LIST})
 
   target_link_libraries(DumpSource2-${GAME} PRIVATE
@@ -15,11 +15,11 @@ function(BUILD_GAME GAME)
     ${CMAKE_DL_LIBS}
   )
 
-  target_compile_definitions(DumpSource2-${GAME} PRIVATE GAME_${GAME})
+  target_compile_definitions(DumpSource2-${GAME} PRIVATE GAME_${GAME} GAME_PATH="${GAME_PATH}")
 endfunction()
 
-build_game(CS2)
-build_game(DOTA)
+build_game(CS2 csgo)
+build_game(DOTA dota)
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Source Files" FILES ${SOURCES_LIST})
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "Header Files" FILES ${HEADERS_LIST})

src/main/appframework.cpp

@@ -138,21 +138,25 @@ void InitializeAppSystems()
 {
 	for (const auto& appSystem : g_appSystems)
 	{
-		if ((appSystem.flags & CS2_ONLY) != 0 && Globals::modName != "csgo")
+#ifndef GAME_CS2
+		if ((appSystem.flags & CS2_ONLY) != 0)
 			continue;
+#endif // !GAME_CS2
 
-		std::string path = appSystem.gameBin ? fmt::format("../../{}/bin/{}", Globals::modName.c_str(), PLATFORM_FOLDER) : "";
+		std::string path = appSystem.gameBin ? fmt::format("../../{}/bin/{}", GAME_PATH, PLATFORM_FOLDER) : "";
 
 		CModule module(path.c_str(), appSystem.moduleName);
 
 		auto interface = module.FindInterface<IAppSystem*>(appSystem.interfaceVersion.c_str());
 
 		g_factoryMap[appSystem.interfaceVersion] = interface;
-
-		if (appSystem.connect && Globals::modName == "csgo")
+		if (appSystem.connect)
 		{
+// TEMP: dota and deadlock is broken rn
+#ifdef GAME_CS2
 			interface->Connect(&AppSystemFactory);
 			interface->Init();
+#endif
 		}
 		else
 		{

src/main/globalvariables.h

@@ -24,7 +24,6 @@
 
 namespace Globals {
 
-	inline std::string modName;
 	inline std::filesystem::path outputPath;
 	inline std::ofstream stringsIgnoreStream;
 

src/main/main.cpp

@@ -28,7 +28,7 @@
 
 void Usage()
 {
-	printf("Usage: DumpSource2 <mod name> <output path>\n");
+	printf("Usage: DumpSource2 <output path>\n");
 }
 
 int main(int argc, char** argv)
@@ -39,8 +39,7 @@ int main(int argc, char** argv)
 		return 0;
 	}
 
-	Globals::modName = argv[1];
-	Globals::outputPath = argv[2];
+	Globals::outputPath = argv[1];
 
 	if (!std::filesystem::is_directory(Globals::outputPath))
 	{
@@ -56,8 +55,9 @@ int main(int argc, char** argv)
 	printf("Dumping\n");
 
 	// TEMP: cs2 and dota/deadlock sdks are mismatched in ICvar vtable right now
-	if(Globals::modName == "csgo")
+	#ifdef GAME_CS2
 		Dumpers::ConCommands::Dump();
+	#endif
 
 	Dumpers::Schemas::Dump();
 }