ShuriZma
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tim Allen 2018-05-28 11:42:52 +10:00
parent 685cec6583
commit bcc2627793
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -34,13 +34,8 @@ higan-linux-x86_64-binaries:
# - bsnes-nightly/* # - bsnes-nightly/*
higan-windows-x86_64-binaries: 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: script:
- apt-get update && apt-get -y install build-essential mingw-w64 mkdocs - 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 # 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 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" - 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/* - higan-nightly/*
#bsnes-windows-x86_64-binaries: #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: # script:
# - apt-get update && apt-get -y install build-essential mingw-w64 # - 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 # # 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 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" # - make -C higan target=bsnes platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"