Move various libs to `src/lib`. Again, expect some breakage.

configure

@@ -794,6 +794,7 @@ find_sdlconfig
 
 SRC="src"
 SRC_OS="$SRC/os"
+SRC_LIB="$SRC/lib"
 CORE="$SRC/emucore"
 COMMON="$SRC/common"
 TIA="$SRC/emucore/tia"
@@ -804,14 +805,14 @@ DBG="$SRC/debugger"
 DBGGUI="$SRC/debugger/gui"
 YACC="$SRC/yacc"
 CHEAT="$SRC/cheat"
-LIBPNG="$SRC/libpng"
+LIBPNG="$SRC_LIB/libpng"
-LIBJPG="$SRC/nanojpeg"
+LIBJPG="$SRC_LIB/nanojpeg"
-LIBJPGEXIF="$SRC/tinyexif"
+LIBJPGEXIF="$SRC_LIB/tinyexif"
-ZLIB="$SRC/zlib"
+ZLIB="$SRC_LIB/zlib"
 SQLITE_REPO="$SRC/common/repository/sqlite"
-SQLITE_LIB="$SRC/sqlite"
+SQLITE_LIB="$SRC_LIB/sqlite"
-JSON="$SRC/json"
+JSON="$SRC_LIB/json"
-HTTP_LIB="$SRC/httplib"
+HTTP_LIB="$SRC_LIB/httplib"
 
 INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER -I$JSON -I$SQLITE_REPO"
 

src/lib/libpng/module.mk

@@ -0,0 +1,24 @@
+MODULE := src/lib/libpng
+
+MODULE_OBJS := \
+	src/lib/libpng/png.o \
+	src/lib/libpng/pngerror.o \
+	src/lib/libpng/pngget.o \
+	src/lib/libpng/pngmem.o \
+	src/lib/libpng/pngpread.o \
+	src/lib/libpng/pngread.o \
+	src/lib/libpng/pngrio.o \
+	src/lib/libpng/pngrtran.o \
+	src/lib/libpng/pngrutil.o \
+	src/lib/libpng/pngset.o \
+	src/lib/libpng/pngtrans.o \
+	src/lib/libpng/pngwio.o \
+	src/lib/libpng/pngwrite.o \
+	src/lib/libpng/pngwtran.o \
+	src/lib/libpng/pngwutil.o
+
+MODULE_DIRS += \
+	src/lib/libpng
+
+# Include common rules
+include $(srcdir)/common.rules

src/lib/sqlite/module.mk

@@ -1,10 +1,10 @@
-MODULE := src/sqlite
+MODULE := src/lib/sqlite
 
 MODULE_OBJS := \
-	src/sqlite/sqlite3.o
+	src/lib/sqlite/sqlite3.o
 
 MODULE_DIRS += \
-	src/sqlite
+	src/lib/sqlite
 
 # Include common rules
 include $(srcdir)/common.rules

src/lib/tinyexif/module.mk

@@ -1,10 +1,10 @@
-MODULE := src/tinyexif
+MODULE := src/lib/tinyexif
 
 MODULE_OBJS := \
-	src/tinyexif/tinyexif.o
+	src/lib/tinyexif/tinyexif.o
 
 MODULE_DIRS += \
-	src/tinyexif
+	src/lib/tinyexif
 
 # Include common rules
 include $(srcdir)/common.rules

src/lib/zlib/module.mk

@@ -0,0 +1,24 @@
+MODULE := src/lib/zlib
+
+MODULE_OBJS := \
+	src/lib/zlib/adler32.o \
+	src/lib/zlib/compress.o \
+	src/lib/zlib/crc32.o \
+	src/lib/zlib/gzclose.o \
+	src/lib/zlib/gzlib.o \
+	src/lib/zlib/gzread.o \
+	src/lib/zlib/gzwrite.o \
+	src/lib/zlib/uncompr.o \
+	src/lib/zlib/deflate.o \
+	src/lib/zlib/trees.o \
+	src/lib/zlib/zutil.o \
+	src/lib/zlib/inflate.o \
+	src/lib/zlib/infback.o \
+	src/lib/zlib/inftrees.o \
+	src/lib/zlib/inffast.o
+
+MODULE_DIRS += \
+	src/lib/zlib
+
+# Include common rules
+include $(srcdir)/common.rules

src/libpng/module.mk

@@ -1,24 +0,0 @@
-MODULE := src/libpng
-
-MODULE_OBJS := \
-	src/libpng/png.o \
-	src/libpng/pngerror.o \
-	src/libpng/pngget.o \
-	src/libpng/pngmem.o \
-	src/libpng/pngpread.o \
-	src/libpng/pngread.o \
-	src/libpng/pngrio.o \
-	src/libpng/pngrtran.o \
-	src/libpng/pngrutil.o \
-	src/libpng/pngset.o \
-	src/libpng/pngtrans.o \
-	src/libpng/pngwio.o \
-	src/libpng/pngwrite.o \
-	src/libpng/pngwtran.o \
-	src/libpng/pngwutil.o
-
-MODULE_DIRS += \
-	src/libpng
-
-# Include common rules 
-include $(srcdir)/common.rules

src/os/libretro/Makefile.common

@@ -1,5 +1,5 @@
 LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common
-INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/os/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite
+INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/os/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/lib/json -I$(CORE_DIR)/lib/httplib -I$(CORE_DIR)/lib/sqlite
 
 ifneq (,$(findstring msvc2003,$(platform)))
 INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc

src/zlib/module.mk

@@ -1,24 +0,0 @@
-MODULE := src/zlib
-
-MODULE_OBJS := \
-	src/zlib/adler32.o \
-	src/zlib/compress.o \
-	src/zlib/crc32.o \
-	src/zlib/gzclose.o \
-	src/zlib/gzlib.o \
-	src/zlib/gzread.o \
-	src/zlib/gzwrite.o \
-	src/zlib/uncompr.o \
-	src/zlib/deflate.o \
-	src/zlib/trees.o \
-	src/zlib/zutil.o \
-	src/zlib/inflate.o \
-	src/zlib/infback.o \
-	src/zlib/inftrees.o \
-	src/zlib/inffast.o
-
-MODULE_DIRS += \
-	src/zlib
-
-# Include common rules 
-include $(srcdir)/common.rules