ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix small issues for mingw builds on Linux 

Doenst like the paths, big surprise. I tipically build it like:

  make platform=win32 CXX=x86_64-w64-mingw32-g++ \
       WINDRES=x86_64-w64-mingw32-windres \
       CC=x86_64-w64-mingw32-gcc
This commit is contained in:
David Guillen Fandos 2019-05-12 17:41:42 +02:00
parent 15ce3ab5fa
commit cbc2af29ad
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/imgread/ioctl.cpp
View File

@ -4,7 +4,7 @@
#include "common.h" #include "common.h"
#include <stddef.h> #include <stddef.h>
#include <Windows.h> #include <windows.h>
#include <ntddscsi.h> #include <ntddscsi.h>
#include "SCSIDEFS.H" #include "SCSIDEFS.H"
@ -388,4 +388,4 @@ Disc* ioctl_parse(const wchar* file)
} }
} }
#endif #endif

6
core/rend/d3d11/d3d11.cpp
View File

@ -1,6 +1,6 @@
#include <d3d11.h> #include <d3d11.h>
#include "hw\pvr\Renderer_if.h" #include "hw/pvr/Renderer_if.h"
#include "oslib\oslib.h" #include "oslib/oslib.h"
#pragma comment(lib,"d3d11.lib") #pragma comment(lib,"d3d11.lib")
@ -102,4 +102,4 @@ struct d3d11 : Renderer
Renderer* rend_D3D11() Renderer* rend_D3D11()
{ {
return new d3d11(); return new d3d11();
} }

2
core/rend/gles/gles.cpp
View File

@ -783,7 +783,7 @@ GLuint fogTextureId;
return rv; return rv;
} }
#include <Wingdi.h> #include <wingdi.h>
void gl_swap() void gl_swap()
{ {
wglSwapLayerBuffers(ourWindowHandleToDeviceContext,WGL_SWAP_MAIN_PLANE); wglSwapLayerBuffers(ourWindowHandleToDeviceContext,WGL_SWAP_MAIN_PLANE);

2
core/stdclass.h
View File

@ -7,7 +7,7 @@
#if HOST_OS!=OS_WINDOWS #if HOST_OS!=OS_WINDOWS
#include <pthread.h> #include <pthread.h>
#else #else
#include <Windows.h> #include <windows.h>
#endif #endif

10
core/windows/winmain.cpp
View File

@ -1,6 +1,6 @@
#include "oslib\oslib.h" #include "oslib/oslib.h"
#include "oslib\audiostream.h" #include "oslib/audiostream.h"
#include "imgread\common.h" #include "imgread/common.h"
#include "stdclass.h" #include "stdclass.h"
#include "cfg/cfg.h" #include "cfg/cfg.h"
#include "xinput_gamepad.h" #include "xinput_gamepad.h"
@ -10,8 +10,8 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#include <Xinput.h> #include <xinput.h>
#include "hw\maple\maple_cfg.h" #include "hw/maple/maple_cfg.h"
#pragma comment(lib, "XInput9_1_0.lib") #pragma comment(lib, "XInput9_1_0.lib")
PCHAR* PCHAR*

2
core/windows/xinput_gamepad.h
View File

@ -1,4 +1,4 @@
#include <Xinput.h> #include <xinput.h>
#include "input/gamepad_device.h" #include "input/gamepad_device.h"
#include "rend/gui.h" #include "rend/gui.h"

3
shell/linux/Makefile
View File

@ -18,6 +18,7 @@ CC=${CC_PREFIX}gcc
AS=${CC_PREFIX}as AS=${CC_PREFIX}as
STRIP=${CC_PREFIX}strip STRIP=${CC_PREFIX}strip
LD=${CC} LD=${CC}
WINDRES=${CC_PREFIX}windres
CHD5_LZMA := 1 CHD5_LZMA := 1
CHD5_FLAC := 1 CHD5_FLAC := 1
@ -432,7 +433,7 @@ OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,$(BUILDDIR)/%,$(OBJECTS))
ifdef FOR_WINDOWS ifdef FOR_WINDOWS
OBJECTS+=$(BUILDDIR)/reicastres.build_obj OBJECTS+=$(BUILDDIR)/reicastres.build_obj
$(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/reicast.ico $(RZDCY_SRC_DIR)/version.h $(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/reicast.ico $(RZDCY_SRC_DIR)/version.h
windres $< $@ $(WINDRES) $< $@
endif endif
DEPDIR := .dep-$(BUILDDIR) DEPDIR := .dep-$(BUILDDIR)