izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16155 from Kingcom/libretro

Browse Source 
Attempt to fix libretro build
This commit is contained in:
Henrik Rydgård
2022-10-03 16:10:41 +02:00
committed by GitHub
parent 360eab3211 e025629d4b
commit 8dc89d676f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -6,7 +6,7 @@
# Core definitions
variables:
GIT_SUBMODULE_STRATEGY: normal
GIT_SUBMODULE_STRATEGY: recursive
.core-defs:
variables:

8
libretro/Makefile
View File

@@ -332,7 +332,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
endif
CFLAGS += $(MSVC2017CompileFlags) -nologo
CXXFLAGS += $(MSVC2017CompileFlags) -nologo -EHsc
CXXFLAGS += $(MSVC2017CompileFlags) -nologo -EHsc -DARMIPS_USE_STD_FILESYSTEM
TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
@@ -443,7 +443,7 @@ else ifneq (,$(findstring windows_msvc2019,$(platform)))
endif
CFLAGS += $(MSVC2019CompileFlags) -nologo
CXXFLAGS += $(MSVC2019CompileFlags) -nologo -EHsc
CXXFLAGS += $(MSVC2019CompileFlags) -nologo -EHsc -DARMIPS_USE_STD_FILESYSTEM
TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
@@ -537,7 +537,7 @@ else ifneq (,$(findstring windows_msvc2019,$(platform)))
else ifneq (,$(findstring win,$(platform)))
TARGET := $(TARGET_NAME)_libretro.dll
CFLAGS += -D_UNICODE -DUNICODE
CXXFLAGS += -fpermissive -Wno-multichar -D_UNICODE -DUNICODE
CXXFLAGS += -fpermissive -Wno-multichar -D_UNICODE -DUNICODE -DARMIPS_USE_STD_FILESYSTEM
LDFLAGS += -shared -Wl,--no-undefined -static-libgcc -static-libstdc++ -Wl,--version-script=link.T -lwinmm -lgdi32 -lwsock32 -lws2_32 -ld3d9 -ld3dx9
GL_LIB := -lopengl32
PLATFORM_EXT = win32
@@ -578,6 +578,8 @@ endif
ifeq (,$(findstring msvc,$(platform)))
CXXFLAGS += -std=c++17
else
CXXFLAGS += -std:c++17
endif
### Finalize ###