From 42da079eb1ee85215d1fca19cd43f8e2a4a7c99b Mon Sep 17 00:00:00 2001 From: mahoneyt944 <49591133+mahoneyt944@users.noreply.github.com> Date: Wed, 5 Aug 2020 02:34:00 -0400 Subject: [PATCH] Windows MSVC 2003 x86 and rpi4 added. Windows MSVC 2003 x86 and rpi4 added. --- Makefile | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8cbaa10c..4a9227f4 100644 --- a/Makefile +++ b/Makefile @@ -191,6 +191,17 @@ else ifeq ($(platform), rpi3) CPU_ARCH := arm ARM = 1 +else ifeq ($(platform), rpi4) + TARGET = $(TARGET_NAME)_libretro.so + fpic = -fPIC + CFLAGS += $(fpic) + LDFLAGS += $(fpic) -shared -Wl,--version-script=link.T + PLATCFLAGS += -marm -mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard + PLATCFLAGS += -fomit-frame-pointer -ffast-math + CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions + CPU_ARCH := arm + ARM = 1 + # Classic Platforms #################### # Platform affix = classic__<µARCH> # Help at https://modmyclassic.com/comp @@ -327,7 +338,7 @@ else ifeq ($(platform), ps3) PLATCFLAGS += -D__CELLOS_LV2__ -D__ppc__ -D__POWERPC__ STATIC_LINKING = 1 SPLIT_UP_LINK=1 - + else ifeq ($(platform), sncps3) TARGET = $(TARGET_NAME)_libretro_ps3.a BIGENDIAN = 1 @@ -473,6 +484,26 @@ PSS_STYLE :=2 LDFLAGS += -DLL LIBS = +# Windows MSVC 2003 x86 +else ifeq ($(platform), windows_msvc2003_x86) + CC = cl.exe + CXX = cl.exe + PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH) + PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../IDE") + INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include") + LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/lib") + BIN := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin") + + WindowsSdkDir := $(INETSDK) + export INCLUDE := $(INCLUDE);$(INETSDK)/Include;src/libretro/libretro-common/include/compat/msvc + export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib + + TARGET := $(TARGET_NAME)_libretro.dll + PSS_STYLE :=2 + LDFLAGS += -DLL + CFLAGS += -D_CRT_SECURE_NO_DEPRECATE + LIBS = + # Windows MSVC 2005 x86 else ifeq ($(platform), windows_msvc2005_x86) CC = cl.exe @@ -581,7 +612,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform))) ifneq (,$(findstring uwp,$(PlatformSuffix))) LIB := $(LIB);$(shell IFS=$$'\n'; cygpath -w "$(LIB)/store") endif - + export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir) export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir) TARGET := $(TARGET_NAME)_libretro.dll