Move lodepng files to deps/lodepng dir

deps/lodepng/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2005-2018 Lode Vandevenne
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+    

makefile

@@ -65,9 +65,9 @@ test: umka_shell
 
 umka_shell: umka_shell.o umka.o shell.o trace.o trace_lbr.o vdisk.o \
             vdisk/raw.o vdisk/qcow2.o deps/em_inflate/em_inflate.o vnet.o \
-            $(HOST)/vnet/tap.o vnet/file.o vnet/null.o lodepng.o $(HOST)/pci.o \
+            $(HOST)/vnet/tap.o vnet/file.o vnet/null.o deps/lodepng/lodepng.o \
-            $(HOST)/thread.o umkaio.o umkart.o deps/optparse/optparse.o \
+            $(HOST)/pci.o $(HOST)/thread.o umkaio.o umkart.o \
-            deps/isocline/src/isocline.o
+            deps/optparse/optparse.o deps/isocline/src/isocline.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ -T umka.ld $(LIBS)
 
 umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o vdisk/raw.o \
@@ -75,10 +75,11 @@ umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o vdisk/raw.o \
            $(HOST)/thread.o umkaio.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ `pkg-config fuse3 --libs` -T umka.ld
 
-umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vdisk/raw.o vdisk/qcow2.o \
+umka_os: umka_os.o umka.o shell.o deps/lodepng/lodepng.o vdisk.o vdisk/raw.o \
-         deps/em_inflate/em_inflate.o vnet.o $(HOST)/vnet/tap.o vnet/file.o \
+         vdisk/qcow2.o deps/em_inflate/em_inflate.o vnet.o $(HOST)/vnet/tap.o \
-         vnet/null.o trace.o trace_lbr.o $(HOST)/pci.o $(HOST)/thread.o \
+         vnet/file.o vnet/null.o trace.o trace_lbr.o $(HOST)/pci.o \
-         umkaio.o umkart.o deps/isocline/src/isocline.o deps/optparse/optparse.o
+         $(HOST)/thread.o umkaio.o umkart.o deps/isocline/src/isocline.o \
+         deps/optparse/optparse.o
 	$(CC) $(LDFLAGS_32) `sdl2-config --libs` $^ -o $@ -T umka.ld
 
 umka_gen_devices_dat: umka_gen_devices_dat.o umka.o $(HOST)/pci.o \
@@ -88,7 +89,7 @@ umka_gen_devices_dat: umka_gen_devices_dat.o umka.o $(HOST)/pci.o \
 umka.o umka.fas: umka.asm
 	$(FASM) $< umka.o -s umka.fas
 
-shell.o: shell.c lodepng.h
+shell.o: shell.c deps/lodepng/lodepng.h
 	$(CC) $(CFLAGS_32) -c $<
 
 umkaio.o: umkaio.c umkaio.h
@@ -100,8 +101,10 @@ $(HOST)/thread.o: $(HOST)/thread.c
 $(HOST)/pci.o: $(HOST)/pci.c
 	$(CC) $(CFLAGS_32) -std=gnu11 -c $< -o $@
 
-lodepng.o: lodepng.c lodepng.h
+deps/lodepng/lodepng.o: deps/lodepng/lodepng.c deps/lodepng/lodepng.h
-	$(CC) $(CFLAGS_32) -c $<
+	$(CC) $(CFLAGS_32) -c $< -DLODEPNG_NO_COMPILE_ZLIB \
+                -DLODEPNG_NO_COMPILE_DECODER -DLODEPNG_NO_COMPILE_DISK \
+                -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS -DLODEPNG_NO_COMPILE_CRC
 
 deps/isocline/src/isocline.o: deps/isocline/src/isocline.c \
         deps/isocline/include/isocline.h

shell.c

@@ -37,7 +37,7 @@
 #include "trace.h"
 #include "pci.h"
 #include "umkart.h"
-#include "lodepng.h"
+#include "lodepng/lodepng.h"
 #include "optparse/optparse.h"
 #include "isocline/include/isocline.h"