Changes to autoconf/automake scripts to improve MSYS2 compatibility. Patch from darksabre76.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PCem v12.
+# Generated by GNU Autoconf 2.69 for PCem v13.1.
 #
 # Report bugs to <Sarah Walker <pcem@pcem-emulator.co.uk>>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PCem'
 PACKAGE_TARNAME='pcem'
-PACKAGE_VERSION='v12'
+PACKAGE_VERSION='v13.1'
-PACKAGE_STRING='PCem v12'
+PACKAGE_STRING='PCem v13.1'
 PACKAGE_BUGREPORT='Sarah Walker <pcem@pcem-emulator.co.uk>'
 PACKAGE_URL=''
 
@@ -1310,7 +1310,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PCem v12 to adapt to many kinds of systems.
+\`configure' configures PCem v13.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1381,7 +1381,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PCem v12:";;
+     short | recursive ) echo "Configuration of PCem v13.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1499,7 +1499,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PCem configure v12
+PCem configure v13.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PCem $as_me v12, which was
+It was created by PCem $as_me v13.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2616,7 +2616,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pcem'
- VERSION='v12'
+ VERSION='v13.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4210,19 +4210,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu" >&5
 $as_echo_n "checking for cpu... " >&6; }
 case "${host_cpu}" in
-	i?86)
+    i?86)
-	CPU=i386
+    CPU=i386
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
 $as_echo "${host_cpu}" >&6; }
-	;;
+    ;;
-	x86_64)
+    x86_64)
-	CPU=x86_64
+    CPU=x86_64
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5
 $as_echo "${host_cpu}" >&6; }
-	;;
+    ;;
-	*)
+    *)
-	as_fn_error $? "Unsupported CPU." "$LINENO" 5
+    as_fn_error $? "Unsupported CPU." "$LINENO" 5
-	;;
+    ;;
 esac
 
  if test "$CPU" = "i386"; then
@@ -5157,7 +5157,7 @@ _ACEOF
 
 else
   echo "You need to install the ALSA library."
-	 exit -1
+     exit -1
 fi
 
 fi
@@ -5219,48 +5219,42 @@ case "$host" in
        build_macosx="yes"
        ;;
     *-*-cygwin* | *-*-mingw32*)
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glGetError in -lGL" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lopengl32" >&5
-$as_echo_n "checking for glGetError in -lGL... " >&6; }
+$as_echo_n "checking for main in -lopengl32... " >&6; }
-if ${ac_cv_lib_GL_glGetError+:} false; then :
+if ${ac_cv_lib_opengl32_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
+LIBS="-lopengl32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
+
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glGetError ();
 int
 main ()
 {
-return glGetError ();
+return main ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_glGetError=yes
+  ac_cv_lib_opengl32_main=yes
 else
-  ac_cv_lib_GL_glGetError=no
+  ac_cv_lib_opengl32_main=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glGetError" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opengl32_main" >&5
-$as_echo "$ac_cv_lib_GL_glGetError" >&6; }
+$as_echo "$ac_cv_lib_opengl32_main" >&6; }
-if test "x$ac_cv_lib_GL_glGetError" = xyes; then :
+if test "x$ac_cv_lib_opengl32_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGL 1
+#define HAVE_LIBOPENGL32 1
 _ACEOF
 
-  LIBS="-lGL $LIBS"
+  LIBS="-lopengl32 $LIBS"
 
 else
   \
@@ -5313,11 +5307,13 @@ _ACEOF
 
 else
   \
-	   echo "You need to install the OpenAL library."
+          echo "You need to install the OpenAL library."
-	   exit -1
+           exit -1
 fi
 
        build_win="yes"
+       SET_MAKE='MAKE=mingw32-make'
+
        ;;
     *)
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glGetError in -lGL" >&5
@@ -5414,8 +5410,8 @@ _ACEOF
 
 else
   \
-	   echo "You need to install the OpenAL library."
+           echo "You need to install the OpenAL library."
-	   exit -1
+           exit -1
 fi
 
        build_linux="yes"
@@ -6061,7 +6057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PCem $as_me v12, which was
+This file was extended by PCem $as_me v13.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6118,7 +6114,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PCem config.status v12
+PCem config.status v13.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,7 +2,7 @@
 #
 
 AC_PREREQ([2.61])
-AC_INIT(PCem, v12, Sarah Walker <pcem@pcem-emulator.co.uk>, pcem)
+AC_INIT(PCem, v13.1, Sarah Walker <pcem@pcem-emulator.co.uk>, pcem)
 
 AC_CANONICAL_HOST
 
@@ -15,7 +15,7 @@ AM_PROG_CC_C_O
 
 AC_MSG_CHECKING([whether to build for release])
 AC_ARG_ENABLE(release_build,
-	      AC_HELP_STRING([--enable-release-build], [build for release]))
+          AC_HELP_STRING([--enable-release-build], [build for release]))
 if test "$enable_release_build" = "yes"; then
    AC_MSG_RESULT([yes])
 else
@@ -25,7 +25,7 @@ AM_CONDITIONAL(RELEASE_BUILD, [test "$enable_release_build" = "yes"])
 
 AC_MSG_CHECKING([whether to enable debugging])
 AC_ARG_ENABLE(debug,
-	      AC_HELP_STRING([--enable-debug], [build debug executable]))
+          AC_HELP_STRING([--enable-debug], [build debug executable]))
 if test "$enable_debug" = "yes"; then
    CFLAGS="-Wall -O0 -g -D_DEBUG"
    AC_MSG_RESULT([yes])
@@ -36,7 +36,7 @@ fi
 
 AC_MSG_CHECKING([whether to enable networking])
 AC_ARG_ENABLE(networking,
-	      AC_HELP_STRING([--enable-networking], [enable networking]))
+          AC_HELP_STRING([--enable-networking], [enable networking]))
 if test "$enable_networking" = "yes"; then
    AC_MSG_RESULT([yes])
 else
@@ -45,7 +45,7 @@ fi
 
 AC_MSG_CHECKING([whether to use ALSA for MIDI output])
 AC_ARG_ENABLE(alsa,
-	      AC_HELP_STRING([--enable-alsa], [use ALSA for MIDI]))
+          AC_HELP_STRING([--enable-alsa], [use ALSA for MIDI]))
 if test "$enable_alsa" = "yes"; then
    AC_MSG_RESULT([yes])
 else
@@ -54,17 +54,17 @@ fi
 
 AC_MSG_CHECKING([for cpu])
 case "${host_cpu}" in
-	i?86)
+    i?86)
-	CPU=i386
+    CPU=i386
-	AC_MSG_RESULT(${host_cpu})
+    AC_MSG_RESULT(${host_cpu})
-	;;
+    ;;
-	x86_64)
+    x86_64)
-	CPU=x86_64
+    CPU=x86_64
-	AC_MSG_RESULT(${host_cpu})
+    AC_MSG_RESULT(${host_cpu})
-	;;
+    ;;
-	*)
+    *)
-	AC_MSG_ERROR([Unsupported CPU.])
+    AC_MSG_ERROR([Unsupported CPU.])
-	;;
+    ;;
 esac
 
 AM_CONDITIONAL(CPU_I386, test "$CPU" = "i386")
@@ -108,7 +108,7 @@ if test "$enable_alsa" == "yes"; then
     AC_CHECK_LIB(asound, snd_pcm_open,
         [],
         [echo "You need to install the ALSA library."
-	 exit -1])
+     exit -1])
 fi
 
 AC_CHECK_LIB([pthread], [pthread_create])
@@ -124,21 +124,22 @@ case "$host" in
        build_macosx="yes"
        ;;
     *-*-cygwin* | *-*-mingw32*)
-       AC_CHECK_LIB([GL], [glGetError], [], \
+       AC_CHECK_LIB([opengl32], [main], [], \
            [echo "You need to install the OpenGL library."
            exit -1])
        AC_CHECK_LIB([openal], [alGetError], [], \
-	   [echo "You need to install the OpenAL library."
+          [echo "You need to install the OpenAL library."
-	   exit -1])
+           exit -1])
        build_win="yes"
-       ;;    
+       AC_SUBST(SET_MAKE, 'MAKE=mingw32-make')
+       ;;
     *)
        AC_CHECK_LIB([GL], [glGetError], [], \
            [echo "You need to install the OpenGL library."
            exit -1])
        AC_CHECK_LIB([openal], [alGetError], [], \
-	   [echo "You need to install the OpenAL library."
+           [echo "You need to install the OpenAL library."
-	   exit -1])
+           exit -1])
        build_linux="yes"
        ;;
 esac

src/Makefile.am

@@ -1,18 +1,28 @@
 # Makefile.am for PCem
 
+AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = pcem
-noinst_SCRIPTS = ../pcem
+noinst_SCRIPTS =
-CLEANFILES = $(noinst_SCRIPTS)
+CLEANFILES =
 
+if !OS_WINDOWS
+CLEANFILES += $(noinst_SCRIPTS)
+noinst_SCRIPTS += ../pcem
 ../pcem: pcem
 	cp pcem ..
-
+endif
-slirp/libslirp.a:
-	$(MAKE) -C slirp
 
 amrefresh:	
 
+# Special wxWidgets files
+WINDRES = $(shell wx-config --rescomp)
+wx.res: wx.rc
+	$(WINDRES) -i wx.rc --input-format=rc -o wx.res -O coff
+ 
+wx-resources.cpp : pc.xrc
+	-wxrc -c pc.xrc -o wx-resources.cpp
 
+# PCem
 pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c acer386sx.c ali1429.c  amstrad.c cbm_io.c cdrom-image.cc cdrom-null.c \
 codegen.c codegen_ops.c codegen_timing_486.c codegen_timing_686.c codegen_timing_common.c codegen_timing_pentium.c codegen_timing_winchip.c compaq.c config.c cpu.c \
 dells200.c device.c disc.c disc_fdi.c disc_img.c disc_sector.c dma.c esdi_at.c fdc.c fdc37c665.c fdd.c fdi2raw.c gameport.c \
@@ -30,22 +40,28 @@ vid_icd2061.c vid_ics2595.c vid_incolor.c vid_mda.c vid_olivetti_m24.c vid_oti06
 vid_pc1512.c vid_pc1640.c vid_pcjr.c vid_ps1_svga.c vid_s3.c vid_s3_virge.c vid_sdac_ramdac.c \
 vid_stg_ramdac.c vid_svga.c vid_svga_render.c vid_t1000.c vid_t3100e.c vid_tandy.c vid_tandysl.c vid_tgui9440.c \
 vid_tkd8001_ramdac.c vid_tvga.c vid_unk_ramdac.c vid_vga.c vid_voodoo.c video.c wd76c10.c vid_wy700.c \
-x86seg.c x87.c xtide.c sound_dbopl.cc sound_resid.cc dosbox/cdrom_image.cpp dosbox/dbopl.cpp \
+x86seg.c x87.c xtide.c sound_dbopl.cc sound_resid.cc
-dosbox/nukedopl.cpp dosbox/vid_cga_comp.c resid-fp/convolve.cc resid-fp/convolve-sse.cc resid-fp/envelope.cc \
+
+# DOSBox
+pcem_SOURCES += dosbox/cdrom_image.cpp dosbox/dbopl.cpp dosbox/nukedopl.cpp dosbox/vid_cga_comp.c
+
+# resid-fp
+pcem_SOURCES += resid-fp/convolve.cc resid-fp/convolve-sse.cc resid-fp/envelope.cc \
 resid-fp/extfilt.cc resid-fp/filter.cc resid-fp/pot.cc resid-fp/sid.cc \
 resid-fp/voice.cc resid-fp/wave6581_PS_.cc resid-fp/wave6581_PST.cc \
 resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc resid-fp/wave8580_PS_.cc \
 resid-fp/wave8580_PST.cc resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \
 resid-fp/wave.cc
 
-pcem_CFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
+pcem_CFLAGS = $(subst -fpermissive,,$(shell wx-config --cxxflags) $(shell sdl2-config --cflags))
 pcem_CXXFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
 pcem_LDADD = @LIBS@
 pcem_SOURCES += wx-main.cc wx-config_sel.c wx-dialogbox.cc wx-utils.cc wx-app.cc \
  wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c \
  wx-sdl2.c wx-config.c wx-deviceconfig.cc wx-status.cc wx-sdl2-status.c \
- wx-resources.cpp wx-thread.c wx-common.c wx-sdl2-display.c wx-sdl2-video-renderer.c wx-sdl2-video-gl3.c \
+ wx-thread.c wx-common.c wx-sdl2-video-renderer.c wx-sdl2-video-gl3.c \
- wx-glslp-parser.c wx-shader_man.c wx-shaderconfig.cc wx-joystickconfig.cc wx-createdisc.cc
+ wx-glslp-parser.c wx-shader_man.c wx-shaderconfig.cc wx-joystickconfig.cc wx-createdisc.cc \
+ wx-resources.cpp
 if USE_ALSA
 pcem_LDADD += -lasound
 pcem_SOURCES += midi_alsa.c
@@ -66,17 +82,31 @@ if USE_NETWORKING
 pcem_CFLAGS += -DUSE_NETWORKING
 pcem_CXXFLAGS += -DUSE_NETWORKING
 pcem_SOURCES += ne2000.c nethandler.c wx-hostconfig.c
-pcem_LDADD += slirp/libslirp.a
+# SLiRP
+pcem_SOURCES += slirp/bootp.c slirp/cksum.c slirp/debug.c slirp/if.c slirp/ip_icmp.c \
+slirp/ip_input.c slirp/ip_output.c slirp/mbuf.c slirp/misc.c slirp/queue.c \
+slirp/sbuf.c slirp/slirp.c slirp/socket.c slirp/tcp_input.c slirp/tcp_output.c \
+slirp/tcp_subr.c slirp/tcp_timer.c slirp/tftp.c slirp/udp.c
+
+if OS_WINDOWS
+pcem_LDADD += -lwsock32 -liphlpapi
+endif
+endif
+
+if OS_LINUX
+pcem_SOURCES += cdrom-ioctl-linux.c wx-sdl2-display.c
 endif
 
 if OS_MACOSX
-pcem_SOURCES += cdrom-ioctl-osx.c
+pcem_SOURCES += cdrom-ioctl-osx.c wx-sdl2-display.c
 pcem_CFLAGS += -DPCEM_RENDER_WITH_TIMER -DPCEM_RENDER_TIMER_LOOP
 pcem_CXXFLAGS += -DPCEM_RENDER_WITH_TIMER -DPCEM_RENDER_TIMER_LOOP
 endif
 
-if OS_LINUX
+if OS_WINDOWS
-pcem_SOURCES += cdrom-ioctl-linux.c
+#DEFAULT_INCLUDES = -iquote .
+pcem_SOURCES += cdrom-ioctl.c wx-sdl2-display-win.c
+pcem_LDADD += wx.res
 endif
 
 if !HAS_OFF64T

src/nethandler.c

@@ -1,6 +1,6 @@
 #ifdef _WIN32
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #endif
 #include <stdint.h>
 #include <stdio.h>

src/wx-main.cc

@@ -1,4 +1,5 @@
 #include "wx-app.h"
+#include <SDL2/SDL.h>
 
 extern "C"
 {