Packman Build Service PMBS

libretro-mame2000.changes Changed

libretro-mame2000.spec Changed

_servicedata Changed

libretro-mame2000-0~git20210529.tar.xz/.gitlab-ci.yml Added

@@ -0,0 +1,222 @@
+# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)
+
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
+.core-defs:
+  variables:
+    JNI_PATH: .
+    CORENAME: mame2000
+
+include:
+  ################################## DESKTOPS ################################
+  # Windows 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-mingw.yml'
+    
+  # Windows 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-mingw.yml'
+    
+  # Linux 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-x64.yml'
+
+  # Linux 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-i686.yml'
+
+  # MacOS 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-x64.yml'
+
+  # MacOS ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-arm64.yml'
+    
+  ################################## CELLULAR ################################
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-jni.yml'
+
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  # iOS (armv7)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios9.yml'
+
+  ################################## CONSOLES ################################
+  # Nintendo 3DS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ctr-static.yml'
+    
+  # Nintendo GameCube
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ngc-static.yml'
+
+  # Nintendo Wii
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wii-static.yml'
+
+  # Nintendo WiiU
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wiiu-static.yml'
+
+  # Nintendo Switch
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/libnx-static.yml'
+    
+  # PlayStation Vita
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/vita-static.yml'
+
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
+  #################################### MISC ##################################
+  # Emscripten
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/emscripten-static.yml'
+
+# Stages for building
+stages:
+  - build-prepare
+  - build-shared
+  - build-static
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# Windows 64-bit
+libretro-build-windows-x64:
+  extends:
+    - .libretro-windows-x64-mingw-make-default
+    - .core-defs
+    
+# Windows 32-bit
+libretro-build-windows-i686:
+  extends:
+    - .libretro-windows-i686-mingw-make-default
+    - .core-defs
+    
+# Linux 64-bit
+libretro-build-linux-x64:
+  extends:
+    - .libretro-linux-x64-make-default
+    - .core-defs
+
+# Linux 32-bit
+libretro-build-linux-i686:
+  extends:
+    - .libretro-linux-i686-make-default
+    - .core-defs
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+  tags:
+    - macosx-packaging
+  extends:
+    - .libretro-osx-x64-make-default
+    - .core-defs
+
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+  tags:
+    - macosx-packaging
+  extends:
+    - .libretro-osx-arm64-make-default
+    - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv7a
+android-armeabi-v7a:
+  extends:
+    - .libretro-android-jni-armeabi-v7a
+    - .core-defs
+    
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-jni-arm64-v8a
+    - .core-defs
+
+# Android 64-bit x86
+android-x86_64:
+  extends:
+    - .libretro-android-jni-x86_64
+    - .core-defs
+
+# Android 32-bit x86
+android-x86:
+  extends:
+    - .libretro-android-jni-x86
+    - .core-defs
+
+# 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 #################################
+# Nintendo 3DS
+libretro-build-ctr:
+  extends:
+    - .libretro-ctr-static-retroarch-master
+    - .core-defs
+    
+# Nintendo GameCube
+libretro-build-ngc:
+  extends:
+    - .libretro-ngc-static-retroarch-master
+    - .core-defs
+
+# Nintendo Wii
+libretro-build-wii:
+  extends:
+    - .libretro-wii-static-retroarch-master
+    - .core-defs
+
+# Nintendo WiiU

libretro-mame2000-0~git20200112.tar.xz/Makefile -> libretro-mame2000-0~git20210529.tar.xz/Makefile Changed

@@ -71,10 +71,21 @@
    TARGET := $(TARGET_NAME)_libretro.dylib
    fpic := -fPIC
 ifeq ($(arch),ppc)
-		CFLAGS += -D__ppc__ -DMSB_FIRST
+	CFLAGS += -D__ppc__ -DMSB_FIRST
 endif
    SHARED := -dynamiclib
+ifeq ($(shell uname -p),i386)
    IS_X86 = 1
+endif
+   CFLAGS += -DHAVE_POSIX_MEMALIGN
+
+   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)))
@@ -91,10 +102,10 @@
 
 ifeq ($(platform),ios-arm64)
    CC = cc -arch arm64 -isysroot $(IOSSDK)
-	LD = armv7-apple-darwin11-ld
+   LD = armv7-apple-darwin11-ld
 else
    CC = cc -arch armv7 -isysroot $(IOSSDK)
-	LD = armv7-apple-darwin11-ld
+   LD = armv7-apple-darwin11-ld
 endif
 
 ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
@@ -110,11 +121,13 @@
 	SHARED := -dynamiclib
 	CFLAGS += -DHAVE_POSIX_MEMALIGN
 
+
 ifeq ($(IOSSDK),)
    IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 endif
 
-CFLAGS += -DIOS -D__arm__ -DHAVE_POSIX_MEMALIGN=1
+   CFLAGS += -DIOS -D__arm__ -DHAVE_POSIX_MEMALIGN=1
+   CC = cc -arch arm64 -isysroot $(IOSSDK)
 
 # PS3
 else ifeq ($(platform), ps3)
@@ -204,7 +217,7 @@
     EXT=a
     TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
     DEFINES := -DSWITCH=1 -U__linux__ -U__linux
-    CFLAGS := $(DEFINES) -g -O3 -fPIE -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -ftls-model=local-exec -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
+    CFLAGS := $(DEFINES) -g -O3 -fPIE -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -fcommon -ftls-model=local-exec -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
     CFLAGS += $(INCDIRS)
     CFLAGS	+=	$(INCLUDE)  -D__SWITCH__
     CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
@@ -294,7 +307,7 @@
    CFLAGS += -mfloat-abi=hard -fsingle-precision-constant
    CFLAGS += -Wall -mword-relocations
    CFLAGS += -fomit-frame-pointer -ffast-math
-   CFLAGS += -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables 
+   CFLAGS += -fno-exceptions -fcommon -fno-unwind-tables -fno-asynchronous-unwind-tables 
    CFLAGS += -ftree-vectorize -funroll-loops -fno-optimize-sibling-calls
    HAVE_RZLIB := 1
    DISABLE_ERROR_LOGGING := 1
@@ -528,6 +541,15 @@
 include Makefile.common
 
 DEFS += $(fpic) $(PLATFORM_DEFINES) $(ZLIB_INCLUDE) $(GCC_DEFINES) $(INCFLAGS) $(INCFLAGS_PLATFORM)
+
+ifneq (,$(findstring msvc,$(platform)))
+ifeq ($(DEBUG),1)
+DEFS += -MTd
+else
+DEFS += -MT
+endif
+endif
+
 # combine the various definitions to one
 CDEFS +=  $(ENDIANNESS_DEFINES) $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS)
 
@@ -552,7 +574,6 @@
 else ifeq ($(STATIC_LINKING), 1)
 	$(AR) rcs $@ $(OBJECTS)
 else
-	@echo Linking $@...
 	$(LD) $(SHARED) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LINKOUT)$@
 endif

libretro-mame2000-0~git20200112.tar.xz/src/libretro/libretro-common/libco/aarch64.c -> libretro-mame2000-0~git20210529.tar.xz/src/libretro/libretro-common/libco/aarch64.c Changed

libretro-mame2000-0~git20200112.tar.xz/src/libretro/libretro.c -> libretro-mame2000-0~git20210529.tar.xz/src/libretro/libretro.c Changed

@@ -147,6 +147,8 @@
 static retro_input_poll_t input_poll_cb;
 static retro_input_state_t input_state_cb;
 
+static bool libretro_supports_bitmasks = false;
+
 unsigned skip_disclaimer = 0;
 
 static void update_variables(void)
@@ -225,8 +227,8 @@
 static void update_input(void)
 {
 #define RK(port,key)     input_state_cb(port, RETRO_DEVICE_KEYBOARD, 0,RETROK_##key)
-#define JS(port, button) input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_##button)
-	int i, c = 0;
+#define JS(port, button) joypad_bits & (1 << RETRO_DEVICE_ID_JOYPAD_##button)
+	int i, j, c = 0;
 	input_poll_cb();
 	
 	key[KEY_TAB] = 0;
@@ -238,6 +240,17 @@
 	
 	for (i = 0; i < 4; i++)
 	{
+		int16_t joypad_bits;
+		
+		if (libretro_supports_bitmasks)
+			joypad_bits = input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK);
+		else
+		{
+			joypad_bits = 0;
+			for (j = 0; j < (RETRO_DEVICE_ID_JOYPAD_R3+1); j++)
+				joypad_bits |= input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j) ? (1 << j) : 0;
+		}
+
 		key[KEY_1 + i]   |= JS(i, START);
 		key[KEY_5 + i]   |= JS(i, SELECT);
 		joy_pressed[c++] = JS(i, LEFT);
@@ -463,6 +476,9 @@
 #endif
    init_joy_list();
    update_variables();
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_INPUT_BITMASKS, NULL))
+      libretro_supports_bitmasks = true;
 }
 
 void retro_deinit(void)
@@ -478,6 +494,8 @@
    scond_free(libretro_cond);
    slock_free(libretro_mutex);
 #endif
+
+   libretro_supports_bitmasks = false;
 }
 
 unsigned retro_api_version(void)
@@ -675,7 +693,7 @@
 
 
    int i;
-   memcpy(IMAMEBASEPATH, info->path, strlen(info->path) + 1);
+   memcpy(IMAMEBASEPATH, info->path, strlen(core_sys_directory) + 1);
    if (strrchr(IMAMEBASEPATH, slash)) *(strrchr(IMAMEBASEPATH, slash)) = 0;
    else { IMAMEBASEPATH[0] = '.'; IMAMEBASEPATH[1] = 0; }
    char baseName[1024];
@@ -684,7 +702,7 @@
    memcpy(baseName, romName, strlen(romName) + 1);
    if (strrchr(baseName, '.')) *(strrchr(baseName, '.')) = 0;
 
-   strcpy(IMAMESAMPLEPATH, IMAMEBASEPATH);
+   strcpy(IMAMESAMPLEPATH, core_sys_directory);
    strcat(IMAMESAMPLEPATH, "/samples");
 
    /* do we have a driver for this? */

Changes of Revision 2