Reorganize src dir

binding/binding-mri.cpp

@@ -30,7 +30,7 @@
 #include "sdl-util.h"
 #include "sharedstate.h"
 #include "src/config.h"
-#include "src/util.h"
+#include "src/util/util.h"
 
 #include "boost-hash.h"
 #include <vector>

binding/binding-util.cpp

@@ -23,7 +23,7 @@
 
 #include "exception.h"
 #include "sharedstate.h"
-#include "src/util.h"
+#include "src/util/util.h"
 
 #include <assert.h>
 #include <stdarg.h>

binding/filesystem-binding.cpp

@@ -24,7 +24,7 @@
 #include "filesystem.h"
 #include "sharedstate.h"
 #include "src/config.h"
-#include "src/util.h"
+#include "src/util/util.h"
 
 #if RAPI_FULL > 187
 #include "ruby/encoding.h"

binding/input-binding.cpp

@@ -23,7 +23,7 @@
 #include "exception.h"
 #include "input.h"
 #include "sharedstate.h"
-#include "src/util.h"
+#include "src/util/util.h"
 
 #include <SDL_joystick.h>
 #include <string>

macos/Dependencies/dependencies.make

@@ -184,7 +184,7 @@ $(DOWNLOADS)/sdl2_image/Makefile: $(DOWNLOADS)/sdl2_image/configure
 	$(CONFIGURE) --enable-static=true --enable-shared=false \
 	--disable-imageio \
 	--enable-png=yes --enable-png-shared=no \
-	--enable-jpeg=yes --enable-jpeg-shared=no \
+	--enable-jpg=yes --enable-jpg-shared=no \
 	--enable-webp=no
 
 $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh
@@ -293,4 +293,4 @@ clean-compiled:
 
 deps-core: libvorbis sigcxx pixman libpng libjpeg objfw physfs sdl2 sdl2image sdl2ttf 
 deps-binding: ruby
-everything: deps-core deps-binding
+everything: deps-core deps-binding

src/meson.build

@@ -36,7 +36,18 @@ endif
 
 global_args += '-DALCDEVICE_STRUCT=' + alcdev_struct
 
-global_include_dirs += include_directories('.')
+
+global_include_dirs += include_directories('.',
+    'audio',
+    'crypto',
+    'display', 'display/gl',
+    'etc',
+    'filesystem',
+    'input',
+    'system',
+    'util'
+)
+
 global_dependencies += [sigcxx, openal, zlib, pixman, physfs, vorbisfile, sdl2, sdl2_ttf, sdl2_image]
 if host_system == 'darwin'
     global_dependencies += compilers['cpp'].find_library('iconv')
@@ -65,52 +76,57 @@ endif
 
 main_source = files(
     'main.mm',
-    'audio.cpp',
-    'bitmap.cpp',
-    'eventthread.cpp',
-    'filesystem.mm',
-    'font.cpp',
-    'input.cpp',
-    'plane.cpp',
-    'scene.cpp',
-    'sprite.cpp',
-    'table.cpp',
-    'tilequad.cpp',
-    'viewport.cpp',
-    'window.cpp',
-    'texpool.cpp',
-    'shader.cpp',
-    'glstate.cpp',
-    'tilemap.cpp',
-    'autotiles.cpp',
-    'graphics.cpp',
-    'gl-debug.cpp',
-    'etc.cpp',
     'config.mm',
+    'eventthread.cpp',
     'settingsmenu.cpp',
-    'keybindings.cpp',
-    'tileatlas.cpp',
     'sharedstate.cpp',
-    'gl-fun.cpp',
+    
-    'gl-meta.cpp',
+    'audio/alstream.cpp',
-    'vertex.cpp',
+    'audio/audio.cpp',
-    'soundemitter.cpp',
+    'audio/audiostream.cpp',
-    'sdlsoundsource.cpp',
+    'audio/fluid-fun.cpp',
-    'alstream.cpp',
+    'audio/midisource.cpp',
-    'audiostream.cpp',
+    'audio/sdlsoundsource.cpp',
-    'vorbissource.cpp',
+    'audio/soundemitter.cpp',
-    'windowvx.cpp',
+    'audio/vorbissource.cpp',
-    'tilemapvx.cpp',
+
-    'tileatlasvx.cpp',
+    'crypto/rgssad.cpp',
-    'autotilesvx.cpp',
+
-    'midisource.cpp',
+    'display/autotiles.cpp',
-    'fluid-fun.cpp',
+    'display/autotilesvx.cpp',
-    'lang-fun.mm',
+    'display/bitmap.cpp',
-    'rgssad.cpp'
+    'display/font.cpp',
+    'display/graphics.cpp',
+    'display/plane.cpp',
+    'display/sprite.cpp',
+    'display/tilemap.cpp',
+    'display/tilemapvx.cpp',
+    'display/viewport.cpp',
+    'display/window.cpp',
+    'display/windowvx.cpp',
+
+    'display/gl/gl-debug.cpp',
+    'display/gl/gl-fun.cpp',
+    'display/gl/gl-meta.cpp',
+    'display/gl/glstate.cpp',
+    'display/gl/scene.cpp',
+    'display/gl/shader.cpp',
+    'display/gl/texpool.cpp',
+    'display/gl/tileatlas.cpp',
+    'display/gl/tileatlasvx.cpp',
+    'display/gl/tilequad.cpp',
+    'display/gl/vertex.cpp',
+    
+    'etc/etc.cpp',
+    'etc/table.cpp',
+
+    'filesystem/filesystem.mm',
+    
+    'input/input.cpp',
+    'input/keybindings.cpp',
+
+    'system/fake-api.mm',
+    'system/lang-fun.mm'
 )
 
-if get_option('easypoke') == true and miniffi == true
-    main_source += files('fake-api.mm')
-endif
-
 global_sources += main_source