build updates for windows and os x

Makefile.am

@@ -63,7 +63,8 @@ bin_PROGRAMS = \
 	fs-uae-device-helper
 
 noinst_PROGRAMS = \
-	gen/build68k gen/genblitter \
+	gen/build68k \
+	gen/genblitter \
 	gen/gencomp \
 	gen/gencpu \
 	gen/genlinetoscr
@@ -625,8 +626,17 @@ noinst_HEADERS = \
 	src/include/tabletlibrary.h \
 	src/include/traps.h \
 	src/include/uae.h \
-	src/include/uae/fs.h \
+	src/include/uae/types.h \
+	src/include/uae/string.h \
+	src/include/uae/regparam.h \
+	src/include/uae/memory.h \
 	src/include/uae/jitconfig.h \
+	src/include/uae/enum.h \
+	src/include/uae/fs.h \
+	src/include/uae/asm.h \
+	src/include/uae/inline.h \
+	src/include/uae/cycleunit.h \
+	src/include/uae/limits.h \
 	src/include/uaeexe.h \
 	src/include/uaeipc.h \
 	src/include/uaenative.h \
@@ -681,6 +691,7 @@ noinst_HEADERS = \
 	src/od-fs/sysconfig.h \
 	src/od-fs/target.h \
 	src/od-fs/tchar.h \
+	src/od-fs/threaddep/sem.h \
 	src/od-fs/threaddep/thread.h \
 	src/od-fs/uae_fs.h \
 	src/od-fs/uae_host.h \
@@ -733,6 +744,17 @@ EXTRA_DIST = \
 	fs-uae.spec \
 	libfsemu/src/emu/keynames.c \
 	libfsemu/src/ml/sdl2_keys.c \
+	licenses/fs-uae.txt \
+	licenses/glib.txt \
+	licenses/ipflib.txt \
+	licenses/libgcc.txt \
+	licenses/libintl.txt \
+	licenses/libpng.txt \
+	licenses/libstdc++.txt \
+	licenses/lua.txt \
+	licenses/zlib.txt \
+	macosx/fs-uae-config.icns \
+	macosx/fs-uae.icns \
 	macosx/PkgInfo \
 	macosx/standalone.py \
 	po \
@@ -748,31 +770,31 @@ EXTRA_DIST = \
 	share/applications \
 	share/fs-uae \
 	share/icons
-
-gen/blit.h: gen/genblitter
-	gen/genblitter i > gen/blit.h
 
-gen/blitfunc.cpp: gen/genblitter gen/blitfunc.h
-	gen/genblitter f > gen/blitfunc.cpp
+gen/blit.h: gen/genblitter$(EXEEXT)
+	gen/genblitter$(EXEEXT) i > gen/blit.h
+
+gen/blitfunc.cpp: gen/genblitter$(EXEEXT) gen/blitfunc.h
+	gen/genblitter$(EXEEXT) f > gen/blitfunc.cpp
 
-gen/blitfunc.h: gen/genblitter
-	gen/genblitter h > gen/blitfunc.h
+gen/blitfunc.h: gen/genblitter$(EXEEXT)
+	gen/genblitter$(EXEEXT) h > gen/blitfunc.h
 
-gen/blittable.cpp: gen/genblitter gen/blitfunc.h
-	gen/genblitter t > gen/blittable.cpp
+gen/blittable.cpp: gen/genblitter$(EXEEXT) gen/blitfunc.h
+	gen/genblitter$(EXEEXT) t > gen/blittable.cpp
 
-gen/compemu.cpp: gen/gencomp
-	gen/gencomp
+gen/compemu.cpp: gen/gencomp$(EXEEXT)
+	gen/gencomp$(EXEEXT)
 
 gen/compstbl.cpp: gen/compemu.cpp
 
 gen/comptbl.h: gen/compemu.cpp
 
-gen/cpudefs.cpp: gen/build68k src/table68k
-	./gen/build68k < src/table68k > gen/cpudefs.cpp
+gen/cpudefs.cpp: gen/build68k$(EXEEXT) src/table68k
+	./gen/build68k$(EXEEXT) < src/table68k > gen/cpudefs.cpp
 
-gen/cpuemu_0.cpp: gen/gencpu
-	cd gen && ./gencpu --optimized-flags
+gen/cpuemu_0.cpp: gen/gencpu$(EXEEXT)
+	cd gen && ./gencpu$(EXEEXT) --optimized-flags
 
 gen/cpuemu_11.cpp: gen/cpuemu_0.cpp
 
@@ -796,8 +818,8 @@ gen/cpustbl.cpp: gen/cpuemu_0.cpp
 
 gen/cputbl.h: gen/cpuemu_0.cpp
 
-gen/linetoscr.cpp: gen/genlinetoscr
-	gen/genlinetoscr > gen/linetoscr.cpp
+gen/linetoscr.cpp: gen/genlinetoscr$(EXEEXT)
+	gen/genlinetoscr$(EXEEXT) > gen/linetoscr.cpp
 
 catalogs = \
 	share/locale/cs/LC_MESSAGES/fs-uae.mo \
@@ -817,63 +839,63 @@ catalogs = \
 	share/locale/tr/LC_MESSAGES/fs-uae.mo
 
 share/locale/cs/LC_MESSAGES/fs-uae.mo: po/cs.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/cs/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/da/LC_MESSAGES/fs-uae.mo: po/da.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/da/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/de/LC_MESSAGES/fs-uae.mo: po/de.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/de/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/el/LC_MESSAGES/fs-uae.mo: po/el.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/el/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/es/LC_MESSAGES/fs-uae.mo: po/es.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/es/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/fi/LC_MESSAGES/fs-uae.mo: po/fi.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/fi/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/fr/LC_MESSAGES/fs-uae.mo: po/fr.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/fr/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/it/LC_MESSAGES/fs-uae.mo: po/it.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/it/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/nb/LC_MESSAGES/fs-uae.mo: po/nb.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/nb/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/pl/LC_MESSAGES/fs-uae.mo: po/pl.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/pl/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/pt/LC_MESSAGES/fs-uae.mo: po/pt.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/pt/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/pt_BR/LC_MESSAGES/fs-uae.mo: po/pt_BR.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/pt_BR/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/sr/LC_MESSAGES/fs-uae.mo: po/sr.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/sr/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/sv/LC_MESSAGES/fs-uae.mo: po/sv.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/sv/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 share/locale/tr/LC_MESSAGES/fs-uae.mo: po/tr.po
-	mkdir -p share/locale/$*/LC_MESSAGES
+	mkdir -p share/locale/tr/LC_MESSAGES
 	$(MSGFMT) --verbose $< -o $@
 
 mo: $(catalogs)

bootstrap.sh

@@ -2,16 +2,17 @@
 echo "Boostrapping fs-uae..."
 # version number is cached in autom4te.cache
 rm -Rf autom4te.cache
-echo "Running aclocal"
+# cat m4/* | grep -v "#serial" > acinclude.m4
+echo "Running aclocal -I m4"
 if [ -e /opt/share/aclocal ]; then
 	# extra m4 macros installed on mingw system
-	aclocal -I/opt/share/aclocal
+	aclocal -I m4 -I /opt/share/aclocal
 else
-	aclocal
+	aclocal -I m4
 fi
 echo "Running autoheader"
 autoheader
-echo "Running automake"
+echo "Running automake --add-missing --copy"
 automake --add-missing --copy
 echo "Running autoconf"
 autoconf

configure.ac

@@ -9,7 +9,7 @@ AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([src/main.cpp])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIRS([m4])
+# AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE([subdir-objects])
 
 AC_SUBST([PACKAGE_SERIES], [devel])
@@ -419,22 +419,22 @@ AS_IF([test "x$enable_jit" != xno], [
 
 # Udis86
 
-AC_ARG_ENABLE(
-    [udis86],
-    [AS_HELP_STRING(
-            [--enable-udis86],
-            [enable support for JIT compilation @<:@default=no@:>@]
-    )],
-    [],
-    [enable_udis86=no]
-)
-AS_IF(
-    [test "x$enable_udis86" != xno],
-    [
-        AC_CHECK_LIB([udis86], [ud_init])
-    ],
-    []
-)
+#AC_ARG_ENABLE(
+#    [udis86],
+#    [AS_HELP_STRING(
+#            [--enable-udis86],
+#            [enable support for JIT compilation @<:@default=no@:>@]
+#    )],
+#    [],
+#    [enable_udis86=no]
+#)
+#AS_IF(
+#    [test "x$enable_udis86" != xno],
+#    [
+#        AC_CHECK_LIB([udis86], [ud_init])
+#    ],
+#    []
+#)
 
 # Byte swapping
 

macosx/Makefile.in

@@ -22,8 +22,8 @@ bundle:
 	cp ../fs-uae-device-helper fs-uae_$(version)_macosx/FS-UAE.app/Contents/MacOS/
 	cp -pPR ../share/* fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources
 	strip fs-uae_$(version)_macosx/FS-UAE.app/Contents/MacOS/*
-	cp ../icon/fs-uae.icns fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/
-	cp ../icon/fs-uae-config.icns fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/
+	cp fs-uae.icns fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/
+	cp fs-uae-config.icns fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/
 	cp -pPR ../licenses fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/
 	cp ../COPYING fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/
 	cp ../README fs-uae_$(version)_macosx/FS-UAE.app/Contents/Resources/

src/od-fs/caps.cpp

@@ -3,13 +3,12 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#ifndef WINDOWS
-
+#ifndef _WIN32
 #include <dlfcn.h>
-
 #define __int64 long long
 typedef void* HMODULE;
 #define __cdecl
+#endif
 
 #ifdef MACOSX
 #include <mach-o/dyld.h>
@@ -36,10 +35,14 @@ const char* amiga_get_caps_library_path(void) {
 
 }
 
+#ifndef _WIN32
+
 void *GetProcAddress(void *handle, const char *symbol) {
     return dlsym(handle, symbol);
 }
 
+#endif
+
 HMODULE load_caps_library() {
     HMODULE handle = NULL;
     write_log("load_caps_library\n");
@@ -49,15 +52,13 @@ HMODULE load_caps_library() {
     }
     write_log("- trying to load %s\n", g_caps_library_path);
 #ifdef WINDOWS
-    handle = LoadLibrary (dllname);
+    handle = LoadLibrary (g_caps_library_path);
 #else
     handle = dlopen(g_caps_library_path, RTLD_LAZY);
 #endif
     return handle;
 }
 
-#endif
-
 #ifdef CAPS
 
 #ifdef WINDOWS

windows/Makefile.in

@@ -25,6 +25,8 @@ progdir:
 	cp /opt/bin/libiconv*.dll $(emulator_dir)
 	cp /opt/bin/SDL2.dll $(emulator_dir)
 	cp /opt/bin/OpenAL32.dll $(emulator_dir)
+	cp /opt/bin/libmpeg2-0.dll $(emulator_dir)
+	cp /opt/bin/libmpeg2convert-0.dll $(emulator_dir)
 
 	cp -a ../fs-uae.exe $(emulator_dir)/
 	cp -a ../fs-uae.dat $(emulator_dir)/