Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libretro-2048 for openSUSE:Factory checked in at 2021-09-17 23:26:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libretro-2048 (Old) and /work/SRC/openSUSE:Factory/.libretro-2048.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libretro-2048" Fri Sep 17 23:26:13 2021 rev:3 rq:919767 version:0~git20210814 Changes: -------- --- /work/SRC/openSUSE:Factory/libretro-2048/libretro-2048.changes 2020-06-07 21:35:43.116955639 +0200 +++ /work/SRC/openSUSE:Factory/.libretro-2048.new.1899/libretro-2048.changes 2021-09-17 23:26:36.861271643 +0200 @@ -1,0 +2,58 @@ +Fri Sep 10 14:57:25 UTC 2021 - [email protected] + +- Update to version 0~git20210814: + * Get rid of printfs at startup + * Add ios-arm64, tvos-arm64 + * (MSVC 2005) We need to embed MSVCR runtime into the DLL for better compatibility + * Fix lib dirs + * Fix MSVC2005/2010 solutions - add MSVC2005/2010 to gitlab + * Update + * Update Makefile.libretro + * (macOS) Update macOS ARM64 building - and use CROSS_COMPILE + * Update Makefile.libretro + * Update Makefile.libretro + * Update Makefile.libretro + * Update Makefile.libretro + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update Makefile.libretro + * Update Makefile.libretro + * Update Makefile.libretro + * Update Makefile.libretro + * Update Makefile.libretro + * Update Makefile.libretro + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Revert "Update .gitlab-ci.yml" + * Update .gitlab-ci.yml + * Don't set LD if PREINITIALIZED=1 + * Add msvc10 x64 support + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Add ARM64 Mac support + * Make it to compile + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update Makefile.libretro + * Update .gitlab-ci.yml + * Update + * Add wiiu target + * Update + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Add ps2 target + * Add vita + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update JNI_PATH + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Add .gitlab-ci.yml + +------------------------------------------------------------------- Old: ---- libretro-2048-0~git20200520.tar.xz New: ---- libretro-2048-0~git20210814.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libretro-2048.spec ++++++ --- /var/tmp/diff_new_pack.nztWqZ/_old 2021-09-17 23:26:37.285272021 +0200 +++ /var/tmp/diff_new_pack.nztWqZ/_new 2021-09-17 23:26:37.289272025 +0200 @@ -1,7 +1,7 @@ # # spec file for package libretro-2048 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libretro-2048 -Version: 0~git20200520 +Version: 0~git20210814 Release: 0 Summary: 2048 libretro core License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.nztWqZ/_old 2021-09-17 23:26:37.325272057 +0200 +++ /var/tmp/diff_new_pack.nztWqZ/_new 2021-09-17 23:26:37.325272057 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/libretro/libretro-2048.git</param> - <param name="changesrevision">0ecbf29c432dbb46083cbd6b00dadb8ea712c5c4</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">1ff7d5c3835ad89e5ce5eaa409b91c9a17cc1aa0</param></service></servicedata> \ No newline at end of file ++++++ libretro-2048-0~git20200520.tar.xz -> libretro-2048-0~git20210814.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20200520/.gitlab-ci.yml new/libretro-2048-0~git20210814/.gitlab-ci.yml --- old/libretro-2048-0~git20200520/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libretro-2048-0~git20210814/.gitlab-ci.yml 2021-08-14 03:51:41.000000000 +0200 @@ -0,0 +1,280 @@ +# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper) + +############################################################################## +################################# BOILERPLATE ################################ +############################################################################## + +# Core definitions +.core-defs: + variables: + JNI_PATH: . + CORENAME: 2048 + MAKEFILE: Makefile.libretro + +# Inclusion templates, required for the build to work +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' + + # Windows msvc10 64-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/windows-x64-msvc10-msys2.yml' + + # Windows msvc10 32-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/windows-i686-msvc10-msys2.yml' + + # Windows msvc05 32-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/windows-i686-msvc05-msys2.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 PowerPC 32-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/osx-ppc.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 ################################ + # PlayStation Portable + - project: 'libretro-infrastructure/ci-templates' + file: '/psp-static.yml' + + # PlayStation Vita + - project: 'libretro-infrastructure/ci-templates' + file: '/vita-static.yml' + + # PlayStation2 + - project: 'libretro-infrastructure/ci-templates' + file: '/ps2-static.yml' + + # 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' + + # 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 + +# Windows msvc10 64-bit +libretro-build-windows-msvc10-x64: + extends: + - .libretro-windows-x64-msvc10-msys2-make-default + - .core-defs + +# Windows msvc10 32-bit +libretro-build-windows-msvc10-i686: + extends: + - .libretro-windows-i686-msvc10-msys2-make-default + - .core-defs + +# Windows msvc05 32-bit +libretro-build-windows-msvc05-i686: + extends: + - .libretro-windows-i686-msvc05-msys2-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: + extends: + - .libretro-osx-x64-make-default + - .core-defs + +# MacOS ARM 64-bit +libretro-build-osx-arm64: + extends: + - .libretro-osx-arm64-make-default + - .core-defs + +# MacOS PowerPC 32-bit +libretro-build-osx-ppc: + extends: + - .libretro-osx-ppc-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 ################################# +# PlayStation Portable +libretro-build-psp: + extends: + - .libretro-psp-static-retroarch-master + - .core-defs + +# PlayStation Vita +libretro-build-vita: + extends: + - .libretro-vita-static-retroarch-master + - .core-defs + +# PlayStation2 +libretro-build-ps2: + extends: + - .libretro-ps2-static-retroarch-master + - .core-defs + +# 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-build-wiiu: + extends: + - .libretro-wiiu-static-retroarch-master + - .core-defs + +# Nintendo Switch +libretro-build-libnx-aarch64: + extends: + - .libretro-libnx-static-retroarch-master + - .core-defs + +#################################### MISC ################################## +# Emscripten +libretro-build-emscripten: + extends: + - .libretro-emscripten-static-retroarch-master + - .core-defs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20200520/Makefile new/libretro-2048-0~git20210814/Makefile --- old/libretro-2048-0~git20200520/Makefile 2020-05-20 20:12:28.000000000 +0200 +++ new/libretro-2048-0~git20210814/Makefile 2021-08-14 03:51:41.000000000 +0200 @@ -1,129 +1,19 @@ - -ifneq ($(EMSCRIPTEN),) - platform = emscripten -endif - -ifeq ($(platform),) -platform = unix -ifeq ($(shell uname -a),) - platform = win -else ifneq ($(findstring MINGW,$(shell uname -a)),) - platform = win -else ifneq ($(findstring Darwin,$(shell uname -a)),) - platform = osx -else ifneq ($(findstring win,$(shell uname -a)),) - platform = win -endif -endif - -TARGET_NAME := 2048 - -fpic= -ifeq ($(platform), unix) - TARGET := $(TARGET_NAME)_libretro.so - fpic := -fPIC - SHARED := -shared -Wl,--no-undefined -else ifeq ($(platform), osx) - TARGET := $(TARGET_NAME)_libretro.dylib - fpic := -fPIC - SHARED := -dynamiclib -else ifeq ($(platform), ios) - TARGET := $(TARGET_NAME)_libretro_ios.dylib - fpic := -fPIC - SHARED := -dynamiclib - DEFINES := -DIOS - CC = clang -arch armv7 -isysroot $(IOSSDK) -else ifeq ($(platform), qnx) - TARGET := $(TARGET_NAME)_libretro_qnx.so - fpic := -fPIC - SHARED := -shared -Wl,--no-undefined -else ifeq ($(platform), emscripten) - TARGET := $(TARGET_NAME)_libretro_emscripten.so - fpic := -fPIC - SHARED := -shared -Wl,--no-undefined -else - CC = gcc - TARGET := $(TARGET_NAME)_libretro.dll - SHARED := -shared -static-libgcc -static-libstdc++ -Wl,--no-undefined -s -endif - -ifeq ($(DEBUG), 1) - CFLAGS += -O0 -g -else - CFLAGS += -O3 -endif - -OBJECTS := libretro.o game_cairo.o game_shared.o -CFLAGS += -Wall -pedantic $(fpic) - -#packages=cairo -#LFLAGS := $(shell pkg-config --libs-only-L --libs-only-other $(packages)) -#LIBS := $(shell pkg-config --libs-only-l $(packages)) -lm -DEP_INSTALL_DIR := $(CURDIR)/tmp - -CFLAGS += -I$(DEP_INSTALL_DIR)/include -LFLAGS := -L$(DEP_INSTALL_DIR)/lib -LIBS := $(DEP_INSTALL_DIR)/lib/libcairo.a $(DEP_INSTALL_DIR)/lib/libpixman-1.a -lpthread -lfreetype -lfontconfig -lm - -ifeq ($(platform), win) - LIBS += -lgdi32 -lmsimg32 -endif - -ifeq ($(platform), qnx) - CFLAGS += -Wc,-std=gnu99 -else - CFLAGS += -std=gnu99 -endif - -with_fpic= -ifneq ($(fpic),) - with_fpic := --with-pic=yes -endif - -host_opts= -ifneq ($(HOST),) - host_opts := --host=$(HOST) -endif - -all: $(TARGET) - -deps: $(DEP_INSTALL_DIR)/lib/libcairo.a - -$(OBJECTS): deps - -$(TARGET): $(OBJECTS) - $(CC) $(fpic) $(SHARED) $(INCLUDES) $(LFLAGS) -o $@ $(OBJECTS) $(LIBS) - -#pixman_LIBS="../pixman/src/libpixman-1.la" \ - -$(DEP_INSTALL_DIR)/lib/libpixman-1.a: - cd pixman; \ - ./configure $(host_opts) --enable-shared=no --enable-static=yes $(with_fpic) CFLAGS="-fno-lto" --prefix=$(DEP_INSTALL_DIR) && \ - make; make install - -$(DEP_INSTALL_DIR)/lib/libcairo.a: $(DEP_INSTALL_DIR)/lib/libpixman-1.a - cd cairo; \ - ./configure $(host_opts) --enable-static=yes --enable-ft=yes --enable-shared=no \ - --enable-gobject=no --enable-trace=no --enable-interpreter=no \ - --enable-symbol-lookup=no --enable-svg=no --enable-pdf=no --enable-ps=no \ - --enable-wgl=no --enable-glx=no --enable-egl=no --disable-valgrind \ - --enable-silent-rules --enable-png=no --enable-xlib=no \ - --enable-drm=no --enable-xcb-drm=no --enable-drm-xr=no --disable-lto \ - $(with_fpic) CFLAGS="-fno-lto" \ - pixman_CFLAGS="-I$(DEP_INSTALL_DIR)/include/pixman-1" pixman_LIBS="-L$(DEP_INSTALL_DIR)/lib -lpixman-1" --prefix=$(DEP_INSTALL_DIR) && \ - make; make install - -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -clean_cairo: - cd cairo; [[ -f Makefile ]] && make distclean || true - -clean_pixman: - cd pixman; [[ -f Makefile ]] && make distclean || true - -clean: clean_cairo clean_pixman - rm -Rf $(OBJECTS) $(TARGET) $(DEP_INSTALL_DIR) - -.PHONY: clean - +!IF "$(PLATFORM)"=="X64" || "$(PLATFORM)"=="x64" +ARCH=amd64 +!ELSE +ARCH=x86 +!ENDIF + +CC=cl +RD=rd/s/q +RM=del/q +LINKER=link +TARGET=2048_libretro.dll + +OBJS=\ + libretro.obj \ + game_shared.obj \ + game_noncairo.obj + +$(TARGET): $(OBJS) + $(LINKER) $(LFLAGS) $(LIBS) /OUT:$a $** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20200520/Makefile.libretro new/libretro-2048-0~git20210814/Makefile.libretro --- old/libretro-2048-0~git20200520/Makefile.libretro 2020-05-20 20:12:28.000000000 +0200 +++ new/libretro-2048-0~git20210814/Makefile.libretro 2021-08-14 03:51:41.000000000 +0200 @@ -1,5 +1,6 @@ STATIC_LINKING=0 +# platform ifeq ($(platform),) platform = unix ifeq ($(shell uname -s),) @@ -8,10 +9,6 @@ platform = win else ifneq ($(findstring Darwin,$(shell uname -s)),) platform = osx - arch = intel - ifeq ($(shell uname -p),powerpc) - arch = ppc - endif else ifneq ($(findstring win,$(shell uname -s)),) platform = win endif @@ -28,6 +25,9 @@ ifeq ($(shell uname -p),powerpc) arch = ppc endif + ifeq ($(shell uname -p),arm) + arch = arm + endif else ifneq ($(findstring MINGW,$(shell uname -a)),) system_platform = win endif @@ -78,10 +78,23 @@ TARGET := $(TARGET_NAME)_libretro.$(EXT) fpic := -fPIC SHARED := -dynamiclib - OSXVER = `sw_vers -productVersion | cut -d. -f 2` - OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` - fpic += -mmacosx-version-min=10.1 - CFLAGS += $(ARCHFLAGS) + MACSOSVER = `sw_vers -productVersion | cut -d. -f 1` + OSXVER = `sw_vers -productVersion | cut -d. -f 2` + OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` + ifeq ($(OSX_LT_MAVERICKS),YES) + fpic += -mmacosx-version-min=10.1 + 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 + + CFLAGS += $(ARCHFLAGS) + CXXFLAGS += $(ARCHFLAGS) LDFLAGS += $(ARCHFLAGS) # iOS @@ -144,26 +157,6 @@ TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT) STATIC_LINKING = 1 -# PS3 -else ifeq ($(platform), ps3) - EXT=a - TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT) - CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - CC_AS = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe - PLATFORM_DEFINES := -D__CELLOS_LV2__ - STATIC_LINKING = 1 - -# sncps3 -else ifeq ($(platform), sncps3) - EXT=a - TARGET := $(TARGET_NAME)_libretro_ps3.$(EXT) - CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe - CC_AS = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe - AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe - PLATFORM_DEFINES := -D__CELLOS_LV2__ - STATIC_LINKING = 1 - # Lightweight PS3 Homebrew SDK else ifeq ($(platform), psl1ght) EXT=a @@ -171,15 +164,15 @@ CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT) CC_AS = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT) AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT) - PLATFORM_DEFINES := -D__CELLOS_LV2__ + PLATFORM_DEFINES := STATIC_LINKING = 1 # PS2 else ifeq ($(platform), ps2) EXT=a TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT) - CC = ee-gcc$(EXE_EXT) - AR = ee-ar$(EXE_EXT) + CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT) + AR = mips64r5900el-ps2-elf-ar$(EXE_EXT) PLATFORM_DEFINES := -DPS2 -G0 -DABGR8888 STATIC_LINKING = 1 @@ -346,6 +339,7 @@ # Windows MSVC 2010 x64 else ifeq ($(platform), windows_msvc2010_x64) + CC = cl.exe CXX = cl.exe @@ -354,16 +348,17 @@ LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64") INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") -WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64 -WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64 - -WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include -WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include +WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*') +WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*') +WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include") +WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl") +WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\x64") INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)" -export INCLUDE := $(INCLUDE) -export LIB := $(LIB);$(WindowsSdkDir) +export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir) +export LIB := $(LIB);$(WindowsSDKLibDir) + TARGET := $(TARGET_NAME)_libretro.dll PSS_STYLE :=2 LDFLAGS += -DLL @@ -377,16 +372,16 @@ LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib") INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") -WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib -WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib - -WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include -WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include +WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*') +WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*') +WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include") +WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl") +WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib") INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)" -export INCLUDE := $(INCLUDE) -export LIB := $(LIB);$(WindowsSdkDir) +export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir) +export LIB := $(LIB);$(WindowsSDKLibDir) TARGET := $(TARGET_NAME)_libretro.dll PSS_STYLE :=2 LDFLAGS += -DLL @@ -402,10 +397,18 @@ LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib") BIN := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin") -WindowsSdkDir := $(INETSDK) +WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*') + +WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include") +WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl") +WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt") +WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl") +WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc") +WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib") + +export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc +export LIB := $(LIB);$(WindowsSDKLibDir) -export INCLUDE := $(INCLUDE);$(INETSDK)/Include;libretro-common/include/compat/msvc -export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib TARGET := $(TARGET_NAME)_libretro.dll PSS_STYLE :=2 LDFLAGS += -DLL @@ -521,6 +524,20 @@ else EXT?=dll + + ifeq ($(MSYSTEM),MINGW64) + CC ?= x86_64-w64-mingw32-gcc + CXX ?= x86_64-w64-mingw32-g++ + COREFLAGS += -DWIN64 + ASFLAGS = -f win64 -d WIN64 + PIC = 1 + else ifeq ($(MSYSTEM),MINGW32) + CC ?= i686-w64-mingw32-gcc + CXX ?= i686-w64-mingw32-g++ + COREFLAGS += -DWIN32 + ASFLAGS = -f win32 -d WIN32 -d LEADING_UNDERSCORE + endif + TARGET := $(TARGET_NAME)_libretro.$(EXT) SHARED := -shared -static-libgcc -static-libstdc++ -Wl,--no-undefined -s endif @@ -531,37 +548,27 @@ endif ifeq ($(DEBUG), 1) + ifneq (,$(findstring msvc,$(platform))) - ifeq ($(STATIC_LINKING),1) - CFLAGS += -MTd - CXXFLAGS += -MTd +CFLAGS += -MTd +CXXFLAGS += -MTd +CFLAGS += -Od -Zi -D_DEBUG +CXXFLAGS += -Od -Zi -D_DEBUG else - CFLAGS += -MDd - CXXFLAGS += -MDd +CFLAGS += -O0 -g +CXXFLAGS += -O0 -g endif -CFLAGS += -Od -Zi -DDEBUG -D_DEBUG -CXXFLAGS += -Od -Zi -DDEBUG -D_DEBUG - else - CFLAGS += -O0 -g -DDEBUG - CXXFLAGS += -O0 -g -DDEBUG -endif +CFLAGS += -DDEBUG +CXXFLAGS += -DDEBUG else + ifneq (,$(findstring msvc,$(platform))) -ifeq ($(STATIC_LINKING),1) - CFLAGS += -MT - CXXFLAGS += -MT -else - CFLAGS += -MD - CXXFLAGS += -MD +CFLAGS += -MT +CXXFLAGS += -MT endif - -CFLAGS += -O2 -DNDEBUG +CFLAGS += -O2 -DNDEBUG CXXFLAGS += -O2 -DNDEBUG -else - CFLAGS += -O2 -DNDEBUG - CXXFLAGS += -O2 -DNDEBUG -endif endif CORE_DIR := . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20200520/game_noncairo.c new/libretro-2048-0~git20210814/game_noncairo.c --- old/libretro-2048-0~git20200520/game_noncairo.c 2020-05-20 20:12:28.000000000 +0200 +++ new/libretro-2048-0~git20210814/game_noncairo.c 2021-08-14 03:51:41.000000000 +0200 @@ -47,10 +47,12 @@ void initgraph(void) { VIRTUAL_WIDTH=SCREEN_WIDTH; +#if 0 printf("GW:%d GH:%d GSZ:%d\n",GRID_WIDTH,GRID_HEIGHT,GRID_SIZE); printf("SP:%d TSZ:%d\n",SPACING,TILE_SIZE); printf("BW:%d BH:%d BOY:%d \n",BOARD_WIDTH,BOARD_HEIGHT,BOARD_OFFSET_Y); printf("size:%dx%dx%d \n",SCREEN_WIDTH,SCREEN_HEIGHT,SCREEN_PITCH); +#endif } void DrawFBoxBmp(char *buffer,int x,int y,int dx,int dy,unsigned color) @@ -336,7 +338,7 @@ srand(t); - initgraph(); + initgraph(); init_luts(); init_static_surface(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20200520/libretro.c new/libretro-2048-0~git20210814/libretro.c --- old/libretro-2048-0~git20200520/libretro.c 2020-05-20 20:12:28.000000000 +0200 +++ new/libretro-2048-0~git20210814/libretro.c 2021-08-14 03:51:41.000000000 +0200 @@ -261,7 +261,6 @@ frame_cb.callback(frame_cb.reference); environ_cb(RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK, &frame_cb); - (void)info; return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20200520/libretro.h new/libretro-2048-0~git20210814/libretro.h --- old/libretro-2048-0~git20200520/libretro.h 2020-05-20 20:12:28.000000000 +0200 +++ new/libretro-2048-0~git20210814/libretro.h 2021-08-14 03:51:41.000000000 +0200 @@ -69,7 +69,7 @@ # endif # endif # else -# if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__) +# if defined(__GNUC__) && __GNUC__ >= 4 # define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default"))) # else # define RETRO_API RETRO_CALLCONV
