Move in-tree libraries to lib/, move main codebase into root of src/

.gitattributes

@@ -1,7 +1,3 @@
 
 # Exclude vendored libraries from GitHub language detection
-src/lua/*			linguist-vendored
+lib/* linguist-vendored
-src/luasocket/*		linguist-vendored
-src/SDL_image/*		linguist-vendored
-src/SDL_mixer/*		linguist-vendored
-src/SDL-mobile/*	linguist-vendored

.github/workflows/android.yml

@@ -4,16 +4,18 @@ on:
   push:
     paths:
       - 'src/**'
+      - 'lib/**'
       - 'android/**'
-      - 'data-*/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/android.yml'
   pull_request:
     paths:
       - 'src/**'
+      - 'lib/**'
       - 'android/**'
-      - 'data-*/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/android.yml'

.github/workflows/linux.yml

@@ -4,14 +4,16 @@ on:
   push:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/linux.yml'
   pull_request:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/linux.yml'

.github/workflows/linux_ss.yml

@@ -4,13 +4,15 @@ on:
   push:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'CMakeLists.txt'
       - '.github/workflows/linux_ss.yml'
   pull_request:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'CMakeLists.txt'
       - '.github/workflows/linux_ss.yml'
 

.github/workflows/macos.yml

@@ -4,14 +4,16 @@ on:
   push:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/macos.yml'
   pull_request:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/macos.yml'

.github/workflows/windows.yml

@@ -4,14 +4,16 @@ on:
   push:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/windows.yml'
   pull_request:
     paths:
       - 'src/**'
-      - 'data-*/**'
+      - 'lib/**'
+      - 'data/**'
       - 'packaging/**'
       - 'CMakeLists.txt'
       - '.github/workflows/windows.yml'

CMakeLists.txt

@@ -89,12 +89,12 @@ endif()
 # ----------------------------------
 
 include_directories(
+	lib/
+	lib/imgui/
+	lib/lua/
+	lib/SDL_image/
+	lib/SDL_mixer/
 	src/
-	src/imgui/
-	src/lua/
-	src/SDL_image/
-	src/SDL_mixer/
-	src/src/
 	${CMAKE_CURRENT_BINARY_DIR})
 
 file(GLOB SRCS
@@ -104,24 +104,24 @@ file(GLOB SRCS
 	src/tms/bindings/cpp/cpp.cc
 	src/tms/modules/3ds.c
 
-	src/lua/*.c
+	src/*.cc
-	src/SDL_image/*.c
+	src/*.c
 
-	src/src/*.cc
+	lib/lua/*.c
-	src/src/*.c
+	lib/SDL_image/*.c
 
-	src/Box2D/Collision/*.cc
+	lib/Box2D/Collision/*.cc
-	src/Box2D/Collision/Shapes/*.cc
+	lib/Box2D/Collision/Shapes/*.cc
-	src/Box2D/Common/*.cc
+	lib/Box2D/Common/*.cc
-	src/Box2D/Dynamics/*.cc
+	lib/Box2D/Dynamics/*.cc
-	src/Box2D/Dynamics/Contacts/*.cc
+	lib/Box2D/Dynamics/Contacts/*.cc
-	src/Box2D/Dynamics/Joints/*.cc
+	lib/Box2D/Dynamics/Joints/*.cc
-	src/Box2D/Particle/*.cc
+	lib/Box2D/Particle/*.cc
 )
 
 if(BACKEND_IMGUI)
 	file(GLOB IMGUI_SRCS
-		src/imgui/*.cpp)
+		lib/imgui/*.cpp)
 	list(APPEND SRCS ${IMGUI_SRCS})
 endif()
 
@@ -143,7 +143,7 @@ if(NOT SCREENSHOT_BUILD)
 	find_package(CURL REQUIRED)
 	include_directories(${CURL_INCLUDE_DIR})
 
-	file(GLOB SDL_mixer_SRCS src/SDL_mixer/*.c)
+	file(GLOB SDL_mixer_SRCS lib/SDL_mixer/*.c)
 	list(APPEND SRCS ${SDL_mixer_SRCS})
 
 	add_definitions(-DBUILD_CURL)
@@ -162,7 +162,7 @@ if(USE_LUASOCKET)
 	add_definitions(-DBUILD_LUASOCKET)
 
 	file(GLOB LUASOCKET_SRCS
-		src/luasocket/*.c)
+		lib/luasocket/*.c)
 
 	list(APPEND SRCS ${LUASOCKET_SRCS})
 endif()

Doxyfile

@@ -14,8 +14,7 @@ BUILTIN_STL_SUPPORT    = YES
 # Input
 RECURSIVE              = YES
 STRIP_FROM_PATH        = src
-INPUT                  = src/main_page.dox \
+INPUT                  = src/
-                         src/src/ src/tms/
 
 # Dot graphs
 HAVE_DOT               = YES

cmake/Modules/GenerateGitVersion.cmake

@@ -10,5 +10,5 @@ else()
 endif()
 
 configure_file(
-	${GENERATE_VERSION_SOURCE_DIR}/src/src/version_info_git.hh.in
+	${GENERATE_VERSION_SOURCE_DIR}/src/version_info_git.hh.in
 	${GENERATE_VERSION_BINARY_DIR}/version_info_git.hh)