Test pull request

.bash_history

@@ -0,0 +1,6 @@
+cd /developer
+make -f Makefile.libretro platform=wiiu -j3 DEBUG_ALLOW_DIRTY_SUBMODULES=1
+make -f Makefile platform=wiiu -j3 DEBUG_ALLOW_DIRTY_SUBMODULES=1
+make clean
+make -f Makefile platform=wiiu -j3 DEBUG_ALLOW_DIRTY_SUBMODULES=1
+exit

.gitlab-ci.yml

@@ -29,6 +29,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-i686.yml'
 
+  # MacOS ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-arm64.yml'
+
   # MacOS 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-x64.yml'
@@ -38,7 +42,11 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
-  # iOS 9
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  # iOS (armv7)
   - project: 'libretro-infrastructure/ci-templates'
     file: '/ios9.yml'
 
@@ -62,7 +70,11 @@ include:
   # Nintendo Switch
   - project: 'libretro-infrastructure/ci-templates'
     file: '/libnx-static.yml'
-
+
+  # PlayStation 2
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ps2-static.yml'
+
   # PlayStation Portable
   - project: 'libretro-infrastructure/ci-templates'
     file: '/psp-static.yml'
@@ -71,6 +83,20 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/vita-static.yml'
 
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
+  # OpenDingux
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/dingux-mips32.yml'
+
+  # OpenDingux (ARM)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/dingux-arm32.yml'
+
+  #################################### MISC ##################################
+
 # Stages for building
 stages:
   - build-prepare
@@ -105,7 +131,13 @@ libretro-build-linux-i686:
 # MacOS 64-bit
 libretro-build-osx-x64:
   extends:
-    - .libretro-osx-x64-make-default
+    - .libretro-osx-x64-make-10-7
+    - .core-defs
+
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-arm64-make-default
     - .core-defs
 
 ################################### CELLULAR #################################
@@ -133,14 +165,31 @@ android-x86:
     - .libretro-android-jni-x86
     - .core-defs
 
-# iOS 9
-libretro-build-ios-9:
+# iOS
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-arm64-make-default
+    - .core-defs
+
+# iOS (armv7) [iOS 9 and up]
+libretro-build-ios9:
   extends:
     - .libretro-ios9-make-default
     - .core-defs
 
+# tvOS
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-arm64-make-default
+    - .core-defs
 
 ################################### CONSOLES #################################
+# PlayStation 2
+libretro-build-ps2:
+  extends:
+    - .libretro-ps2-static-retroarch-master
+    - .core-defs
+
 # PlayStation Portable
 libretro-build-psp:
   extends:
@@ -182,3 +231,15 @@ libretro-build-libnx-aarch64:
   extends:
     - .libretro-libnx-static-retroarch-master
     - .core-defs
+
+# RetroFW
+libretro-build-retrofw-mips32:
+  extends:
+    - .libretro-retrofw-mips32-make-default
+    - .core-defs
+
+# Miyoo
+libretro-build-miyoo-arm32:
+  extends:
+    - .libretro-miyoo-arm32-make-default
+    - .core-defs

Makefile

@@ -83,44 +83,53 @@ else ifeq ($(platform), osx)
 	fpic := -fPIC
 	SHARED := -dynamiclib
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+        CFLAGS += -DHAVE_POSIX_MEMALIGN
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
 	ifeq ($(OSX_LT_MAVERICKS),"YES")
 		fpic += -mmacosx-version-min=10.5
 	endif
 
+   ifeq ($(CROSS_COMPILE),1)
+		TARGET_RULE   = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
+		CFLAGS   += $(TARGET_RULE)
+		CPPFLAGS += $(TARGET_RULE)
+		CXXFLAGS += $(TARGET_RULE)
+		LDFLAGS  += $(TARGET_RULE)
+   endif
+
+
 # iOS
 else ifneq (,$(findstring ios,$(platform)))
 
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
-	CFLAGS += -Wno-error=implicit-function-declaration -DHAVE_POSIX_MEMALIGN
+        MINVERSION :=
+	CFLAGS += -Wno-error=implicit-function-declaration -DHAVE_POSIX_MEMALIGN -DIOS
 
 	ifeq ($(IOSSDK),)
 		IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
 	endif
 
 ifeq ($(platform),$(filter $(platform),ios-arm64))
 	CC = cc -arch arm64 -isysroot $(IOSSDK)
+	CC_AS = cc -arch arm64 -isysroot $(IOSSDK)
 	CXX = c++ -arch arm64 -isysroot $(IOSSDK)
 else
-	CC = cc -arch armv7 -isysroot $(IOSSDK)
-	CXX = c++ -arch armv7 -isysroot $(IOSSDK)
+	CC = cc -marm -arch armv7 -isysroot $(IOSSDK)
+	CC_AS = cc -marm -arch armv7 -isysroot $(IOSSDK)
+	CXX = c++ -marm -arch armv7 -isysroot $(IOSSDK)
 endif
 
 	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
 
 ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
-	CC += -miphoneos-version-min=8.0
-	CXX += -miphoneos-version-min=8.0
-	CC_AS += -miphoneos-version-min=8.0
-	PLATFORM_DEFINES := -miphoneos-version-min=8.0 -DIOS
+        MINVERSION = -miphoneos-version-min=8.0
 else
-	CC += -miphoneos-version-min=5.0
-	CXX += -miphoneos-version-min=5.0
-	CC_AS += -miphoneos-version-min=5.0
-	PLATFORM_DEFINES := -miphoneos-version-min=5.0 -DIOS
+        MINVERSION = -miphoneos-version-min=5.0
 endif
+	PLATFORM_DEFINES := $(MINVERSION) -DIOS
+	LDFLAGS += $(MINVERSION)
 
 # tvOS
 else ifeq ($(platform), tvos-arm64)
@@ -134,6 +143,15 @@ else ifeq ($(platform), tvos-arm64)
 		IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 	endif
 
+	CC = cc -arch arm64 -isysroot $(IOSSDK)
+	CC_AS = cc -arch arm64 -isysroot $(IOSSDK)
+	CXX = c++ -arch arm64 -isysroot $(IOSSDK)
+
+	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
+	MINVERSION = -mappletvos-version-min=11.0
+	PLATFORM_DEFINES := $(MINVERSION)
+	LDFLAGS += $(MINVERSION)
+
 # Theos
 else ifeq ($(platform), theos_ios)
 	DEPLOYMENT_IOSVERSION = 5.0
@@ -157,19 +175,33 @@ else ifeq ($(platform), qnx)
 	PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -fexceptions -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 
 # Lightweight PS3 Homebrew SDK
-else ifeq ($(platform), psl1ght)
-	TARGET := $(TARGET_NAME)_libretro_psl1ght.a
-	CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
-	CC_AS = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
-	CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
-	AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
-	PLATFORM_DEFINES := 
+else ifneq (,$(filter $(platform), ps3 psl1ght))
+	ifeq ($(platform), psl1ght)
+		PLATFORM_DEFINES := -D__PS3__ -D__PSLIGHT__
+	else
+		PLATFORM_DEFINES := -D__PS3__
+	endif
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
+	CC_AS = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
+	CXX = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)g++$(EXE_EXT)
+	AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
 	STATIC_LINKING = 1
 	HAVE_COMPAT = 1
 
+# PS2
+else ifeq ($(platform), ps2)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
+	AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
+	PLATFORM_DEFINES := -DPS2 -D_EE -DABGR1555 -G0 -O3
+	STATIC_LINKING = 1
+	HAVE_COMPAT = 1
+	EXTRA_INCLUDES := -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include
+
 # PSP
 else ifeq ($(platform), psp1)
-	TARGET := $(TARGET_NAME)_libretro_psp1.a
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
 	CC = psp-gcc$(EXE_EXT)
 	AR = psp-ar$(EXE_EXT)
 	PLATFORM_DEFINES := -DPSP
@@ -218,16 +250,15 @@ else ifneq (,$(filter $(platform), ngc wii wiiu))
    CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)  
    PLATFORM_DEFINES += -DGEKKO -mcpu=750 -meabi -mhard-float -DHAVE_STRTOF_L -DHAVE_LOCALE
-   PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE
    STATIC_LINKING = 1
    HAVE_COMPAT = 1
    ifneq (,$(findstring wiiu,$(platform)))
-      CFLAGS += -DDEFAULT_CFG_NAME="\"sd:/retroarch/cores/system/atari800.cfg\""
-      PLATFORM_DEFINES += -DWIIU -DHW_RVL
+      CFLAGS += -DDEFAULT_CFG_NAME="\"fs:/vol/external01/retroarch/cores/system/atari800.cfg\""
+      PLATFORM_DEFINES += -DWIIU -DHW_RVL -ffunction-sections -fdata-sections -D__wiiu__ -D__wut__ -D_GNU_SOURCE
    else ifneq (,$(findstring wii,$(platform)))
-      PLATFORM_DEFINES += -DHW_RVL -mrvl
+      PLATFORM_DEFINES += -DHW_RVL -mrvl -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE
    else ifneq (,$(findstring ngc,$(platform)))
-      PLATFORM_DEFINES += -DHW_DOL -mrvl
+      PLATFORM_DEFINES += -DHW_DOL -mrvl -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE
    endif
 
 # Nintendo Switch (libnx)
@@ -318,9 +349,31 @@ else ifeq ($(platform), classic_armv8_a35)
 	LDFLAGS += -static-libgcc -static-libstdc++
 #######################################
 
+#RETROFW
+else ifeq ($(platform), retrofw)
+	TARGET := $(TARGET_NAME)_libretro.so
+	CC = /opt/retrofw-toolchain/usr/bin/mipsel-linux-gcc
+	CXX = /opt/retrofw-toolchain/usr/bin/mipsel-linux-g++
+	AR = /opt/retrofw-toolchain/usr/bin/mipsel-linux-ar
+	fpic := -fPIC
+	SHARED := -shared -Wl,-version-script=link.T -Wl,-no-undefined
+	CFLAGS += -fomit-frame-pointer -march=mips32 -mtune=mips32 -mhard-float
+	PLATFORM_DEFINES += -DRETROFW
+
+#MIYOO
+else ifeq ($(platform), miyoo)
+	TARGET := $(TARGET_NAME)_libretro.so
+	CC = /opt/miyoo/usr/bin/arm-linux-gcc
+	CXX = /opt/miyoo/usr/bin/arm-linux-g++
+	AR = /opt/miyoo/usr/bin/arm-linux-ar
+	fpic := -fPIC
+	SHARED := -shared -Wl,-version-script=link.T -Wl,-no-undefined
+	CFLAGS += -fomit-frame-pointer -march=armv5te -mtune=arm926ej-s
+
 # emscripten
 else ifeq ($(platform), emscripten)
 	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
+	STATIC_LINKING=1
 # cross Windows
 else ifeq ($(platform), wincross64)
 	TARGET := $(TARGET_NAME)_libretro.dll
@@ -458,8 +511,7 @@ ifeq ($(LOG_PERFORMANCE), 1)
 endif
 
 
-DEFINES := -D__LIBRETRO__ $(PLATFORM_DEFINES) -DINLINE="inline"
-DEFINES += -DHAVE_CONFIG_H
+DEFINES := -D__LIBRETRO__ $(PLATFORM_DEFINES) -DINLINE="inline" -DHAVE_CONFIG_H
 
 CFLAGS   += $(fpic) $(DEFINES)
 CFLAGS   += -Wall
@@ -477,7 +529,7 @@ include Makefile.common
 HEADERS += $(ROMS:.rom=.h) $(SNAPS:.szx=.h)
 OBJECTS += $(SOURCES_C:.c=.o) $(SOURCES_CXX:.cpp=.o)
 
-INCDIRS := $(EXTRA_INCLUDES) $(INCFLAGS)
+INCDIRS := $(INCFLAGS) $(EXTRA_INCLUDES)
 
 OBJOUT   = -o
 LINKOUT  = -o 
@@ -487,7 +539,7 @@ ifneq (,$(findstring msvc,$(platform)))
 	LINKOUT = -out:
 	LD = link.exe
 else ifneq ($(platform),genode)
-	LD = $(CXX)
+	LD = $(CC)
 endif
 
 %.o: %.cpp

Makefile.common

@@ -19,15 +19,20 @@ SOURCES_C := \
 	$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
 	$(LIBRETRO_COMM_DIR)/file/file_path.c \
 	$(LIBRETRO_COMM_DIR)/file/file_path_io.c \
+	$(LIBRETRO_COMM_DIR)/streams/memory_stream.c \
 	$(LIBRETRO_COMM_DIR)/string/stdstring.c \
 	$(LIBRETRO_COMM_DIR)/time/rtime.c \
 	$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c
 
 SOURCES_C += \
+	$(CORE_DIR)/libretro/carts_hash.c \
 	$(CORE_DIR)/libretro/libretro-core.c \
 	$(CORE_DIR)/libretro/core-mapper.c \
 	$(CORE_DIR)/libretro/graph.c \
-	$(CORE_DIR)/libretro/vkbd.c
+	$(CORE_DIR)/libretro/vkbd.c \
+	$(CORE_DIR)/libretro/retro_strings.c \
+	$(CORE_DIR)/libretro/retro_utils.c \
+	$(CORE_DIR)/libretro/retro_disk_control.c
 
 SOURCES_C += \
 	$(CORE_DIR)/atari800/src/afile.c \
@@ -85,10 +90,15 @@ SOURCES_C += \
 #	$(CORE_DIR)/atari800/src/videomode.c\
 #	$(CORE_DIR)/atari800/src/pal_blending.c \
 
+SOURCES_C += \
+	$(CORE_DIR)/atari800/src/roms/altirraos_xl.c \
+	$(CORE_DIR)/atari800/src/roms/altirraos_800.c \
+	$(CORE_DIR)/atari800/src/roms/altirra_basic.c \
+	$(CORE_DIR)/atari800/src/roms/altirra_5200_os.c
+
 ZLIB_INCFLAGS = -I$(DEPS_DIR)/zlib
 ZLIB_SOURCES_C = \
 	$(DEPS_DIR)/zlib/adler32.c \
-	$(DEPS_DIR)/zlib/compress.c \
 	$(DEPS_DIR)/zlib/crc32.c \
 	$(DEPS_DIR)/zlib/deflate.c \
 	$(DEPS_DIR)/zlib/gzclose.c \
@@ -99,7 +109,6 @@ ZLIB_SOURCES_C = \
 	$(DEPS_DIR)/zlib/inflate.c \
 	$(DEPS_DIR)/zlib/inftrees.c \
 	$(DEPS_DIR)/zlib/trees.c \
-	$(DEPS_DIR)/zlib/uncompr.c \
 	$(DEPS_DIR)/zlib/zutil.c
 
 ifeq ($(SYSTEM_ZLIB), 1)