From 00d5063bfcbabe37d15357a9d5d82013f522f03f Mon Sep 17 00:00:00 2001 From: Ilya Shurumov Date: Fri, 11 Dec 2020 03:06:44 +0600 Subject: [PATCH] - fix building --- src_rebuild/PsyX/EMULATOR.H | 3 ++- src_rebuild/PsyX/premake5.lua | 22 +++++++++++----------- src_rebuild/premake5.lua | 18 +++++++++--------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src_rebuild/PsyX/EMULATOR.H b/src_rebuild/PsyX/EMULATOR.H index 219144a0..615fa1a4 100644 --- a/src_rebuild/PsyX/EMULATOR.H +++ b/src_rebuild/PsyX/EMULATOR.H @@ -1,8 +1,9 @@ #ifndef EMULATOR_H #define EMULATOR_H -#include "EMULATOR_PLATFORM_SETUP.H" #include "TYPES.H" +#include "EMULATOR_PLATFORM_SETUP.H" + #include "PGXP_DEFS.H" #include "LIBGTE.H" #include "LIBGPU.H" diff --git a/src_rebuild/PsyX/premake5.lua b/src_rebuild/PsyX/premake5.lua index b9b443bb..4774148c 100644 --- a/src_rebuild/PsyX/premake5.lua +++ b/src_rebuild/PsyX/premake5.lua @@ -34,17 +34,17 @@ project "Psy-X" "OpenAL32" } - filter "platforms:x86" - libdirs { - SDL2_DIR.."/lib/x86", - OPENAL_DIR.."/libs/Win32", - } - - filter "platforms:x86_64" - libdirs { - SDL2_DIR.."/lib/x64", - OPENAL_DIR.."/libs/Win64", - } + filter {"system:Windows", "platforms:x86"} + libdirs { + SDL2_DIR.."/lib/x86", + OPENAL_DIR.."/libs/Win32", + } + + filter {"system:Windows", "platforms:x86_64"} + libdirs { + SDL2_DIR.."/lib/x64", + OPENAL_DIR.."/libs/Win64", + } filter "system:linux" includedirs { diff --git a/src_rebuild/premake5.lua b/src_rebuild/premake5.lua index 0ad11933..3c1eafbd 100644 --- a/src_rebuild/premake5.lua +++ b/src_rebuild/premake5.lua @@ -17,7 +17,7 @@ end workspace "REDRIVER2" configurations { "Debug", "Release", "Release_dev" } - -- platforms { "x86", "x86_64" } + platforms { "x86" } --, "x86_64" } defines { VERSION } @@ -33,14 +33,14 @@ workspace "REDRIVER2" cppdialect "C++11" - filter "platforms:x86_64" - buildoptions { - "-m32" - } - - linkoptions { - "-m32" - } + filter {"system:Linux", "platforms:x86"} + buildoptions { + "-m32" + } + + linkoptions { + "-m32" + } filter "system:Windows" disablewarnings { "4996", "4554", "4244", "4101", "4838", "4309" }