Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to fix libretro build

Browse Source
This commit is contained in:
Kingcom 2022-10-03 15:50:33 +02:00
parent 360eab3211
commit e025629d4b
2 changed files with 6 additions and 4 deletions
Show Stats 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 ###