diff --git a/makefile b/makefile index 3f6ae4fc4..e1b56179e 100644 --- a/makefile +++ b/makefile @@ -86,6 +86,9 @@ mingw471: FORCE mingw510: FORCE @$(MAKE) -s -f makefile.mingw GCC510=1 +#cross compile in linux only 32 bit for now +mingwcc: FORCE + @$(MAKE) -s -f makefile.mingw GCC510=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-win32 WINDRES=i686-w64-mingw32-windres mamemingw: FORCE @$(MAKE) -s -f makefile.mamemingw diff --git a/makefile.mingw b/makefile.mingw index a5d701a58..da911b07d 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -21,6 +21,7 @@ endif # # Specify the name of the executable file, without ".exe" +WINDRES=windres NAME = fbneo COMPILENAME = 3 @@ -594,7 +595,7 @@ $(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generat @$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kops.c -o $(objdir)cpu/m68k/m68kops.o $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c: $(objdir)cpu/m68k/m68kmake.exe $(srcdir)cpu/m68k/m68k_in.c - $(objdir)/cpu/m68k/m68kmake $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c + $(objdir)/cpu/m68k/m68kmake.exe $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c $(objdir)cpu/m68k/m68kmake.exe: $(srcdir)cpu/m68k/m68kmake.c @echo Compiling Musashi MC680x0 core \(m68kmake.c\)... @@ -686,23 +687,23 @@ endif %.o: %.rc @echo Compiling resource file $( -#include +#include #define DIRECTSOUND_VERSION 0x0300 // Only need version from DirectX 3 #include diff --git a/src/intf/audio/win32/aud_xaudio2.cpp b/src/intf/audio/win32/aud_xaudio2.cpp index 6e5a33c27..fcf9e518b 100644 --- a/src/intf/audio/win32/aud_xaudio2.cpp +++ b/src/intf/audio/win32/aud_xaudio2.cpp @@ -2,7 +2,7 @@ #include "aud_dsp.h" //#ifdef _MSC_VER -#include +#include #include #include diff --git a/src/intf/input/win32/inp_dinput.cpp b/src/intf/input/win32/inp_dinput.cpp index 89f204284..2ad46e72a 100644 --- a/src/intf/input/win32/inp_dinput.cpp +++ b/src/intf/input/win32/inp_dinput.cpp @@ -4,7 +4,7 @@ #include "burner.h" #include "inp_keys.h" -#include +#include #define DIRECTINPUT_VERSION 0x0800 #include diff --git a/src/intf/video/win32/vid_d3d.cpp b/src/intf/video/win32/vid_d3d.cpp index 08a399a12..56bf73e30 100644 --- a/src/intf/video/win32/vid_d3d.cpp +++ b/src/intf/video/win32/vid_d3d.cpp @@ -7,7 +7,7 @@ #if !defined BUILD_X64_EXE // #include "vid_directx_support.h" -#include +#include #include "vid_softfx.h" // #define ENABLE_PROFILING FBNEO_DEBUG diff --git a/src/intf/video/win32/vid_ddraw.cpp b/src/intf/video/win32/vid_ddraw.cpp index da82d0a68..d3d3306c6 100644 --- a/src/intf/video/win32/vid_ddraw.cpp +++ b/src/intf/video/win32/vid_ddraw.cpp @@ -6,7 +6,7 @@ #include "vid_directx_support.h" #endif -#include +#include #define DIRECT3D_VERSION 0x0700 // Use this Direct3D version #if defined BUILD_X64_EXE diff --git a/src/intf/video/win32/vid_ddrawfx.cpp b/src/intf/video/win32/vid_ddrawfx.cpp index 230e85eab..ada772f10 100644 --- a/src/intf/video/win32/vid_ddrawfx.cpp +++ b/src/intf/video/win32/vid_ddrawfx.cpp @@ -6,7 +6,7 @@ #include "vid_softfx.h" #endif -#include +#include #define DIRECT3D_VERSION 0x0700 // Use this Direct3D version #if defined BUILD_X64_EXE diff --git a/src/intf/video/win32/vid_directx9.cpp b/src/intf/video/win32/vid_directx9.cpp index 5a9b68667..1c48640a4 100644 --- a/src/intf/video/win32/vid_directx9.cpp +++ b/src/intf/video/win32/vid_directx9.cpp @@ -10,7 +10,7 @@ // #define ENABLE_PROFILING FBNEO_DEBUG // #define LOAD_EFFECT_FROM_FILE -#include +#include #define DIRECT3D_VERSION 0x0900 // Use this Direct3D version #define D3D_OVERLOADS #include diff --git a/src/intf/video/win32/vid_directx_support.cpp b/src/intf/video/win32/vid_directx_support.cpp index 68db9642a..11ecc6fe0 100644 --- a/src/intf/video/win32/vid_directx_support.cpp +++ b/src/intf/video/win32/vid_directx_support.cpp @@ -5,7 +5,7 @@ #include "vid_directx_support.h" #endif -#include +#include #define DIRECT3D_VERSION 0x0700 // Use this Direct3D version #if defined BUILD_X64_EXE