From cbc2af29ad306975be77c9227e9c6e3380ce1a6c Mon Sep 17 00:00:00 2001 From: David Guillen Fandos Date: Sun, 12 May 2019 17:41:42 +0200 Subject: [PATCH] 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 --- core/imgread/ioctl.cpp | 4 ++-- core/rend/d3d11/d3d11.cpp | 6 +++--- core/rend/gles/gles.cpp | 2 +- core/stdclass.h | 2 +- core/windows/winmain.cpp | 10 +++++----- core/windows/xinput_gamepad.h | 2 +- shell/linux/Makefile | 3 ++- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core/imgread/ioctl.cpp b/core/imgread/ioctl.cpp index 4486dc99a..9dfd66b43 100644 --- a/core/imgread/ioctl.cpp +++ b/core/imgread/ioctl.cpp @@ -4,7 +4,7 @@ #include "common.h" #include -#include +#include #include #include "SCSIDEFS.H" @@ -388,4 +388,4 @@ Disc* ioctl_parse(const wchar* file) } } -#endif \ No newline at end of file +#endif diff --git a/core/rend/d3d11/d3d11.cpp b/core/rend/d3d11/d3d11.cpp index bf059af21..974ac94e8 100644 --- a/core/rend/d3d11/d3d11.cpp +++ b/core/rend/d3d11/d3d11.cpp @@ -1,6 +1,6 @@ #include -#include "hw\pvr\Renderer_if.h" -#include "oslib\oslib.h" +#include "hw/pvr/Renderer_if.h" +#include "oslib/oslib.h" #pragma comment(lib,"d3d11.lib") @@ -102,4 +102,4 @@ struct d3d11 : Renderer Renderer* rend_D3D11() { return new d3d11(); -} \ No newline at end of file +} diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp index 9e7c812a2..ea67babf0 100644 --- a/core/rend/gles/gles.cpp +++ b/core/rend/gles/gles.cpp @@ -783,7 +783,7 @@ GLuint fogTextureId; return rv; } - #include + #include void gl_swap() { wglSwapLayerBuffers(ourWindowHandleToDeviceContext,WGL_SWAP_MAIN_PLANE); diff --git a/core/stdclass.h b/core/stdclass.h index 04e9142db..e7f8d2685 100644 --- a/core/stdclass.h +++ b/core/stdclass.h @@ -7,7 +7,7 @@ #if HOST_OS!=OS_WINDOWS #include #else -#include +#include #endif diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp index 44633ab0d..adec1ffa9 100644 --- a/core/windows/winmain.cpp +++ b/core/windows/winmain.cpp @@ -1,6 +1,6 @@ -#include "oslib\oslib.h" -#include "oslib\audiostream.h" -#include "imgread\common.h" +#include "oslib/oslib.h" +#include "oslib/audiostream.h" +#include "imgread/common.h" #include "stdclass.h" #include "cfg/cfg.h" #include "xinput_gamepad.h" @@ -10,8 +10,8 @@ #include #include -#include -#include "hw\maple\maple_cfg.h" +#include +#include "hw/maple/maple_cfg.h" #pragma comment(lib, "XInput9_1_0.lib") PCHAR* diff --git a/core/windows/xinput_gamepad.h b/core/windows/xinput_gamepad.h index 336df20e4..beb311413 100644 --- a/core/windows/xinput_gamepad.h +++ b/core/windows/xinput_gamepad.h @@ -1,4 +1,4 @@ -#include +#include #include "input/gamepad_device.h" #include "rend/gui.h" diff --git a/shell/linux/Makefile b/shell/linux/Makefile index f48d5eb08..c3a32668a 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -18,6 +18,7 @@ CC=${CC_PREFIX}gcc AS=${CC_PREFIX}as STRIP=${CC_PREFIX}strip LD=${CC} +WINDRES=${CC_PREFIX}windres CHD5_LZMA := 1 CHD5_FLAC := 1 @@ -432,7 +433,7 @@ OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,$(BUILDDIR)/%,$(OBJECTS)) ifdef FOR_WINDOWS OBJECTS+=$(BUILDDIR)/reicastres.build_obj $(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/reicast.ico $(RZDCY_SRC_DIR)/version.h - windres $< $@ + $(WINDRES) $< $@ endif DEPDIR := .dep-$(BUILDDIR)