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

Merge pull request #351 from fr500/master 

Bring the core up to speed
This commit is contained in:
OV2 2018-07-03 22:53:02 +02:00 committed by GitHub
parent cb5b6651f4 29bfa104bd
commit cb27f5bf24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1117 additions and 805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretro/Makefile
View File

@ -56,7 +56,7 @@ ifneq (,$(findstring unix,$(platform)))
CC = gcc CC = gcc
SHARED := -shared -z defs SHARED := -shared -z defs
else else
SHARED := -shared -Wl,--version-script=link.T -Wl,-z,defs SHARED := -shared -Wl,--version-script=link.T
endif endif
ifneq ($(findstring Haiku,$(shell uname -a)),) ifneq ($(findstring Haiku,$(shell uname -a)),)
LIBS := LIBS :=
@ -252,11 +252,14 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
LIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib LIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
else ifneq (,$(findstring uwp,$(PlatformSuffix))) else ifneq (,$(findstring uwp,$(PlatformSuffix)))
WinPartition = uwp WinPartition = uwp
MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DWINDLL -D_UNICODE -DUNICODE -DWRL_NO_DEFAULT_LIB MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WINDLL -D_UNICODE -DUNICODE -D__WRL_NO_DEFAULT_LIB__ -ZW:nostdlib -EHsc
LDFLAGS += -APPCONTAINER -NXCOMPAT -DYNAMICBASE -MANIFEST:NO -LTCG -OPT:REF -SUBSYSTEM:CONSOLE -MANIFESTUAC:NO -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1 -DEBUG:FULL -WINMD:NO LDFLAGS += -APPCONTAINER -NXCOMPAT -DYNAMICBASE -MANIFEST:NO -LTCG -OPT:REF -SUBSYSTEM:CONSOLE -MANIFESTUAC:NO -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1 -DEBUG:FULL -WINMD:NO
LIBS += WindowsApp.lib LIBS += WindowsApp.lib
endif endif
# Specific to this core
MSVC2017CompileFlags += -D__WIN32__
CFLAGS += $(MSVC2017CompileFlags) CFLAGS += $(MSVC2017CompileFlags)
CXXFLAGS += $(MSVC2017CompileFlags) CXXFLAGS += $(MSVC2017CompileFlags)
@ -320,6 +323,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE") PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE")
INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
ifneq (,$(findstring uwp,$(PlatformSuffix)))
LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
endif
export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir) export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir) export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir)

1912
libretro/libretro.cpp
View File

File diff suppressed because it is too large Load Diff