From bcc26277935c816693e9fbbcb4c636050545488a Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Mon, 28 May 2018 11:42:52 +1000 Subject: [PATCH] Don't hack up nall/GNUmakefile for Windows builds. All our changes are now in official nall releases, so we don't need to mess with it anymore. --- .gitlab-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91160a0e..3e00d848 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,13 +34,8 @@ higan-linux-x86_64-binaries: # - bsnes-nightly/* higan-windows-x86_64-binaries: - # This is a normal Windows cross-compile process, except that - # nall::chrono tries to use clock_gettime on Windows even - # though it's a POSIX function, and for some weird reason mingw has - # clock_gettime() in the pthread library. script: - apt-get update && apt-get -y install build-essential mingw-w64 mkdocs - - sed -i -e 's/-lole32/& -static -lpthread/' nall/GNUmakefile # genius does not currently build on Windows due to lack of a combo edit control in hiro #- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres" - make -C icarus platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres" @@ -61,13 +56,8 @@ higan-windows-x86_64-binaries: - higan-nightly/* #bsnes-windows-x86_64-binaries: -# # This is a normal Windows cross-compile process, except that -# # nall::chrono tries to use clock_gettime on Windows even -# # though it's a POSIX function, and for some weird reason mingw has -# # clock_gettime() in the pthread library. # script: # - apt-get update && apt-get -y install build-essential mingw-w64 -# - sed -i -e 's/-lole32/& -static -lpthread/' nall/GNUmakefile # # genius does not currently build on Windows due to lack of a combo edit control in hiro # #- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres" # - make -C higan target=bsnes platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"