Fixes after previous commit

diff --git a/cd32_fmv.cpp b/cd32_fmv.cpp
index b4e0c146f382f8186c10c074a9756c5b37f83131..51787571290e60afe88c567eda52fcd05edd3226 100644 (file)
--- a/cd32_fmv.cpp
+++ b/cd32_fmv.cpp
@@ -27,16 +27,8 @@
 #include "cda_play.h"
 #include "archivers/mp2/kjmp2.h"
 
-#ifdef USE_LIBMPEG2
-#if (!defined _WIN32 && !defined ANDROID)
-extern "C" {
-#include "mpeg2dec/mpeg2.h"
-#include "mpeg2dec/mpeg2convert.h"
-}
-#else
 #include "mpeg2.h"
 #include "mpeg2convert.h"
-#endif
 
 #define FMV_DEBUG 0
 static int fmv_audio_debug = 0;
@@ -1599,3 +1591,4 @@ addrbank *cd32_fmv_init (struct autoconfig_info *aci)
 
        return &fmv_rom_bank;
 }
+

diff --git a/cpuboard.cpp b/cpuboard.cpp
index 3393e47cd2bba739ad981f50a4affda679214e1d..346d2688d834b36648d59e9e022b1155b01442ff 100644 (file)
--- a/cpuboard.cpp
+++ b/cpuboard.cpp
@@ -3171,6 +3171,7 @@ bool cpuboard_autoconfig_init(struct autoconfig_info *aci)
        } else {
                protect_roms(true);
        }
+#ifdef WITH_CPUBOARD
 
        if (f0rom_size) {
                if (is_a2630(p)) {

diff --git a/fsusage.cpp b/fsusage.cpp
index 3b4e1b880dcafc7a18521c18bf2537483069c882..4dad92cb2b006d6a2cc878372d7add36be3c4613 100644 (file)
--- a/fsusage.cpp
+++ b/fsusage.cpp
@@ -25,15 +25,6 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/stat.h>
 #endif
 
-#if defined(STAT_STATVFS) && !defined(__ANDROID__)
-#include <sys/statvfs.h>
-// For osx, sigurbjornl
-#elif defined (__MACH__)
-#include <sys/mount.h>
-#else
-#include <sys/vfs.h>
-#endif
-
 #include "fsusage.h"
 
 /* Return the number of TOSIZE-byte blocks used by

diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h
index 32889276cb878d767a5e5277bcd79c93a54f47d6..38d7bbaec6405ee6c767d0e7fbaefd31709d2008 100644 (file)
--- a/od-win32/sysconfig.h
+++ b/od-win32/sysconfig.h
@@ -153,10 +153,10 @@
 // Special Monitors support
 #define WITH_SPECIALMONITORS
 
-//#define VIDEOGRAB 1
+#define VIDEOGRAB 1
 
 // Beam racing support
-//#define WITH_BEAMRACER
+#define WITH_BEAMRACER
 
 #define A_ZIP
 #define A_RAR

diff --git a/pcem/pcemglue.cpp b/pcem/pcemglue.cpp
index bfef9645929245c4898129e8b2491d2c135f6d9e..34a43be8fb953dd2d998acb164a09097e9deb3e0 100644 (file)
--- a/pcem/pcemglue.cpp
+++ b/pcem/pcemglue.cpp
@@ -1,3 +1,5 @@
+#include "sysconfig.h"
+#include "sysdeps.h"
 
 #include "uae.h"
 #include "ibm.h"
@@ -24,8 +26,6 @@
 
 #include "pcemglue.h"
 
-#include "sysconfig.h"
-#include "sysdeps.h"
 #include "threaddep/thread.h"
 #include "machdep/maccess.h"
 #include "gfxboard.h"

diff --git a/vm.cpp b/vm.cpp
index 4eb52a00ee5e408a79341ad8f739c7f91a688b6f..6b1fc1d271c2d4837db7674bb2ea3676d24d0dac 100644 (file)
--- a/vm.cpp
+++ b/vm.cpp
@@ -25,7 +25,7 @@
 #endif
 
 //#if defined(LINUX) && defined(CPU_x86_64)
-#if defined(CPU_x86_64) && !defined(__APPLE__)
+#if defined(CPU_x86_64) && !defined(__APPLE__) && !defined(_WIN32)
 #define HAVE_MAP_32BIT 1
 #endif