- Update to 0.3

3 files changed, 62 insertions, 26 deletions

diff --git a/emulators/wxmupen64plus/files/patch-wscript b/emulators/wxmupen64plus/files/patch-wscript
index ace8f57cb4c5..9bb0a4a2d6ce 100644
--- a/emulators/wxmupen64plus/files/patch-wscript
+++ b/emulators/wxmupen64plus/files/patch-wscript
@@ -1,27 +1,41 @@
---- wscript	2011-10-17 09:27:26.000000000 -0500
-+++ wscript	2011-12-17 22:26:58.000000000 -0500
-@@ -153,15 +153,21 @@
-         data_dir = bld.path.find_dir('data')
-         bld.install_files('wxMupen64Plus.app/Contents/Resources', data_dir.ant_glob('*'))
-         bin_install_path = "wxMupen64Plus.app/Contents/MacOS"
--        
-+    elif os.uname()[0] == 'FreeBSD':
-+        if 'LOCALBASE' in os.environ:
-+           LOCALBASE = os.environ['LOCALBASE']
-+        else:
-+           LOCALBASE = '/usr/local/'
-+
-+        build_flags += ['-I'+ LOCALBASE +'/include/X11']
-+        osal_src += ['mupen64plusplus/osal_dynamiclib_unix.c', 'mupen64plusplus/osal_files_unix.c']
-+        link_flags += ['-lGL','-lX11']
+--- wscript.orig	2012-03-18 17:28:41.000000000 -0500
++++ wscript	2013-10-04 20:56:33.000000000 -0500
+@@ -83,14 +83,13 @@
+     ctx.env['datadir'] = Options.options.datadir
+     ctx.env['libdir'] = Options.options.libdir
+     
+-    ctx.find_program('gcc', var='GCC', mandatory=True)
+-    ctx.find_program('g++', var='GPP', mandatory=True)
++    ctx.find_program('%%CC%%', var='GCC', mandatory=True)
++    ctx.find_program('%%CXX%%', var='GPP', mandatory=True)
+     ctx.check_cc(header_name="stdio.h", function_name='printf', msg='Checking C compiler works', errmsg="No")
+     ctx.check_cxx(header_name="cstdio", function_name='printf', msg='Checking C++ compiler works', errmsg="No")
+     ctx.check_cc(header_name="m64p_frontend.h",   includes=[api_path])
+     ctx.check_cc(header_name="m64p_config.h",     includes=[api_path])
+     ctx.check_cc(header_name="m64p_types.h",      includes=[api_path])
+-    ctx.check_cc(header_name="../main/version.h", includes=[api_path])
+ 
+     ctx.check_cfg(path=sdl_config, args='--cflags --libs',   package='', uselib_store='SDL')
+     
+@@ -99,20 +98,7 @@
+             ctx.fatal("On Windows, the --wxhome argument is mandatory")
+         ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --prefix=' + wxhome + ' ' + wxconfig_args + ' --libs core,base,gl,html', package='', uselib_store='wxWidgets')
      else:
-         # For other unices
-         build_flags += ['-I/usr/include/X11']
-         osal_src += ['mupen64plusplus/osal_dynamiclib_unix.c', 'mupen64plusplus/osal_files_unix.c']
-         link_flags += ['-lGL', '-ldl', '-lX11']
-         
--        link_flags += ['-ldl']
--        
-         # install target
-         data_dir = bld.path.find_dir('data')
-         if len(bld.env['datadir']) > 0:
+-        ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --libs core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets')
+-
+-    ctx.check_cc(compile_filename='test.c', execute=False, cflags=["-I"+api_path], msg="Checking mupen64plus is recent enough...", fragment=
+-"""#include "../main/version.h"
+-   #if FRONTEND_API_VERSION < 0x020001
+-   #error Your mupen64plus build is too old, please upgrade
+-   #endif
+-   #if CONFIG_API_VERSION < 0x020000
+-   #error Your mupen64plus build is too old, please upgrade
+-   #endif
+-   #if VIDEXT_API_VERSION < 0x020000
+-   #error Your mupen64plus build is too old, please upgrade
+-   #endif
+-   int main(int argc, char** argv) {}""")
++        ctx.check_cfg(msg="Checking for wxWidgets 2.9.x", path=wx_config,  args='--version=2.9 --cxxflags --libs adv,core,base,gl,html ' + wxconfig_args, package='', uselib_store='wxWidgets')
+ 
+ # --------------------------------------------------------------------------------------------
+ #                                            BUILD
diff --git a/emulators/wxmupen64plus/files/patch-wxvidext.cpp b/emulators/wxmupen64plus/files/patch-wxvidext.cpp
new file mode 100644
index 000000000000..7725f0153bb3
--- /dev/null
+++ b/emulators/wxmupen64plus/files/patch-wxvidext.cpp
@@ -0,0 +1,11 @@
+--- wxvidext.cpp	2013-10-04 20:22:46.000000000 -0500
++++ wxvidext.cpp	2013-10-04 20:24:08.000000000 -0500
+@@ -455,7 +455,7 @@
+ #endif
+ */
+ 
+-m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_video_mode*/ int ScreenMode)
++m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_video_mode*/ int ScreenMode, int Flags)
+ {
+     gWidth = Width;
+     gHeight = Height;
diff --git a/emulators/wxmupen64plus/files/patch-wxvidext.h b/emulators/wxmupen64plus/files/patch-wxvidext.h
new file mode 100644
index 000000000000..98c6aeb30c52
--- /dev/null
+++ b/emulators/wxmupen64plus/files/patch-wxvidext.h
@@ -0,0 +1,11 @@
+--- wxvidext.h	2013-10-04 20:22:58.000000000 -0500
++++ wxvidext.h	2013-10-04 20:23:12.000000000 -0500
+@@ -29,7 +29,7 @@
+ m64p_error VidExt_Init(void);
+ m64p_error VidExt_Quit(void);
+ m64p_error VidExt_ListFullscreenModes(m64p_2d_size *SizeArray, int *NumSizes);
+-m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_video_mode*/ int ScreenMode);
++m64p_error VidExt_SetVideoMode(int Width, int Height, int BitsPerPixel, /*m64p_video_mode*/ int ScreenMode, int Flags);
+ m64p_error VidExt_SetCaption(const char *Title);
+ m64p_error VidExt_ToggleFullScreen(void);
+ void* VidExt_GL_GetProcAddress(const char* Proc);