From e089311f7ee16883d4365a4df359442b2c865847 Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Tue, 30 Mar 2021 10:13:34 +0100 Subject: [PATCH] (.gitlab-ci.yml) Do not compile with local=true - this is not portable --- .gitlab-ci.yml | 3 +++ bsnes/.gitignore | 3 +++ bsnes/GNUmakefile | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 bsnes/.gitignore diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc915af9..f2961b4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,11 +13,13 @@ MAKEFILE: GNUmakefile binary: library target: libretro + local: portable .core-defs-windows: extends: .core-defs after_script: - mv ${MAKEFILE_PATH}/out/${CORENAME}_libretro.dll ${CORENAME}_libretro.dll + - if [ $STRIP_CORE_LIB -eq 1 ]; then strip --strip-unneeded ${CORENAME}_libretro.dll; fi variables: platform: windows @@ -25,6 +27,7 @@ extends: .core-defs after_script: - mv ${MAKEFILE_PATH}/out/${CORENAME}_libretro.so ${CORENAME}_libretro.so + - if [ $STRIP_CORE_LIB -eq 1 ]; then strip --strip-unneeded ${CORENAME}_libretro.so; fi variables: platform: linux diff --git a/bsnes/.gitignore b/bsnes/.gitignore new file mode 100644 index 00000000..22034c46 --- /dev/null +++ b/bsnes/.gitignore @@ -0,0 +1,3 @@ +*.o +*.so +*.dll diff --git a/bsnes/GNUmakefile b/bsnes/GNUmakefile index 8cf89980..9edfe86a 100644 --- a/bsnes/GNUmakefile +++ b/bsnes/GNUmakefile @@ -2,7 +2,7 @@ target ?= bsnes binary ?= application build := performance openmp := true -local := true +local ?= true flags += -I. -I.. # in order for this to work, obj/lzma.o must be omitted or bsnes will hang on startup.