Small datadirs improvement (#77)

* CMakeLists.txt: better use of name variables * rt_datadir.c: save shareware data in "huntbgin"
fabiangreffrath · Jul 12, 2024 · 2ab3463 · 2ab3463
1 parent 14d889e
commit 2ab3463
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,8 +39,8 @@ endif()
 
 add_executable(${TARADINO_EXEC} ${TARADINO_SOURCES})
 target_link_libraries(${TARADINO_EXEC} PRIVATE SDL2::Main SDL2::Mixer)
-target_compile_definitions(${TARADINO_EXEC} PRIVATE PACKAGE_STRING="${TARADINO_EXEC} ${CMAKE_PROJECT_VERSION}")
-target_compile_definitions(${TARADINO_EXEC} PRIVATE PACKAGE_TARNAME="${TARADINO_EXEC}")
+target_compile_definitions(${TARADINO_EXEC} PRIVATE PACKAGE_STRING="${TARADINO_TITLE} ${CMAKE_PROJECT_VERSION}")
+target_compile_definitions(${TARADINO_EXEC} PRIVATE PACKAGE_TARNAME="${CMAKE_PROJECT_NAME}")
 
 if(${TARADINO_SHAREWARE})
 	target_compile_definitions(${TARADINO_EXEC} PRIVATE SHAREWARE=1)

diff --git a/rott/rt_datadir.c b/rott/rt_datadir.c
@@ -68,13 +68,15 @@ char *GetPrefDir (void)
 
         M_MakeDirectory(dir);
 
-#if !(SHAREWARE == 1)
         result = dir;
+#if !(SHAREWARE == 1)
         dir = M_StringJoin(result, "darkwar", PATH_SEP_STR, NULL);
+#else
+        dir = M_StringJoin(result, "huntbgin", PATH_SEP_STR, NULL);
+#endif
         free(result);
 
         M_MakeDirectory(dir);
-#endif
     }
 
     return dir;