Move filename_formatter to /source

obsidian-level-maker · Jun 22, 2024 · 3f7dce6 · 3f7dce6
1 parent 7271192
commit 3f7dce6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.12..3.20)
 if(NOT CONSOLE_ONLY)
   add_subdirectory(libraries/fltk EXCLUDE_FROM_ALL)
 endif()
-add_subdirectory(libraries/filename_formatter EXCLUDE_FROM_ALL)
 add_subdirectory(libraries/libgrapheme EXCLUDE_FROM_ALL)
 add_subdirectory(libraries/miniz EXCLUDE_FROM_ALL)
 add_subdirectory(libraries/physfs EXCLUDE_FROM_ALL)
@@ -66,8 +65,10 @@ set(OBSIDIAN_SOURCE_FILES
     source/csg_spots.cc
     source/dm_extra.cc
     source/dm_prefab.cc
+    source/ff_main.cc
     source/g_doom.cc
     source/g_wolf.cc
+    source/lex.yy.c
     source/lib_argv.cc
     source/lib_tga.cc
     source/lib_util.cc
@@ -130,8 +131,6 @@ if(NOT CONSOLE_ONLY)
     obsidian SYSTEM PRIVATE "${PROJECT_BINARY_DIR}/libraries/fltk"
   ) # Hack for FLTK 1.4 (for now)
 endif()
-target_include_directories(
-  obsidian SYSTEM PRIVATE libraries/filename_formatter)
 target_include_directories(obsidian SYSTEM PRIVATE libraries/gif-h)
 target_include_directories(obsidian SYSTEM PRIVATE libraries/libgrapheme)
 target_include_directories(obsidian SYSTEM PRIVATE libraries/minilua)
@@ -159,8 +158,7 @@ if(UNIX)
     if(NOT CONSOLE_ONLY)
       target_link_libraries(
         obsidian
-        PRIVATE filename_formatter
-                fltk
+        PRIVATE fltk
                 fltk_images
                 libgrapheme
                 miniz
@@ -172,31 +170,29 @@ if(UNIX)
       )
     else()
       target_link_libraries(
-        obsidian PRIVATE filename_formatter libgrapheme miniz physfs-static
+        obsidian PRIVATE libgrapheme miniz physfs-static
       )
     endif()
   elseif(${CMAKE_SYSTEM} MATCHES "BSD")
     if(NOT CONSOLE_ONLY)
       target_link_libraries(
         obsidian
-        PRIVATE filename_formatter
-                fltk
+        PRIVATE fltk
                 fltk_images
                 libgrapheme
                 miniz
                 physfs-static
       )
     else()
       target_link_libraries(
-        obsidian PRIVATE filename_formatter libgrapheme miniz physfs-static
+        obsidian PRIVATE libgrapheme miniz physfs-static
       )
     endif()
   else()
     if(NOT CONSOLE_ONLY)
       target_link_libraries(
         obsidian
-        PRIVATE filename_formatter
-                fltk
+        PRIVATE fltk
                 fltk_images
                 libgrapheme
                 miniz
@@ -207,8 +203,7 @@ if(UNIX)
     else()
       target_link_libraries(
         obsidian
-        PRIVATE filename_formatter
-                libgrapheme
+        PRIVATE libgrapheme
                 miniz
                 physfs-static
                 pthread
@@ -219,16 +214,15 @@ else()
   if(NOT CONSOLE_ONLY)
     target_link_libraries(
       obsidian
-      PRIVATE filename_formatter
-              fltk
+      PRIVATE fltk
               fltk_images
               libgrapheme
               miniz
               physfs-static
     )
   else()
     target_link_libraries(
-      obsidian PRIVATE filename_formatter libgrapheme miniz physfs-static
+      obsidian PRIVATE libgrapheme miniz physfs-static
     )
   endif()
 endif()
diff --git a/libraries/filename_formatter/CMakeLists.txt b/libraries/filename_formatter/CMakeLists.txt
diff --git a/libraries/filename_formatter/ff.h → source/ff.h b/libraries/filename_formatter/ff.h → source/ff.h
diff --git a/libraries/filename_formatter/ff_main.cpp → source/ff_main.cc b/libraries/filename_formatter/ff_main.cpp → source/ff_main.cc
diff --git a/libraries/filename_formatter/ff_main.h → source/ff_main.h b/libraries/filename_formatter/ff_main.h → source/ff_main.h
diff --git a/libraries/filename_formatter/filename.l → source/filename.l b/libraries/filename_formatter/filename.l → source/filename.l
diff --git a/libraries/filename_formatter/lex.yy.c → source/lex.yy.c b/libraries/filename_formatter/lex.yy.c → source/lex.yy.c
diff --git a/libraries/filename_formatter/lex.yy.h → source/lex.yy.h b/libraries/filename_formatter/lex.yy.h → source/lex.yy.h