DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

windowsify rogue build (#1310)

Browse Source 
* update rogue makefile

* update roguelib libs

* update rogue makefile

* update rogue libs

* add ncurses

* add rogue WIN artifacts
This commit is contained in:
ca333
2019-03-04 00:18:45 +01:00
committed by jl777
parent 7f0cadf5d2
commit a4ed36e3c4
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@@ -71,6 +71,10 @@ build:windows:
- cp src/komodod.exe - cp src/komodod.exe
src/komodo-cli.exe src/komodo-cli.exe
src/komodo-tx.exe src/komodo-tx.exe
src/cc/rogue/rogue.exe
zcutil/fetch-params.bat
src/cc/rogue/x86_64-w64-mingw32/libcurl-4.dll
src/cc/rogue/x86_64-w64-mingw32/libncursesw6.dll
${PACKAGE_DIR_WINDOWS} ${PACKAGE_DIR_WINDOWS}
- zip -r ${PACKAGE_DIR_WINDOWS}.zip ${PACKAGE_DIR_WINDOWS} - zip -r ${PACKAGE_DIR_WINDOWS}.zip ${PACKAGE_DIR_WINDOWS}
- md5sum ${AGAMA_ARTIFACTS_WINDOWS} > ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM} - md5sum ${AGAMA_ARTIFACTS_WINDOWS} > ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM}
@@ -91,6 +95,7 @@ build:macos:
key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}" key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
paths: paths:
- depends/built - depends/built
allow_failure: true
script: script:
- zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu) - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
- ./makeRelease.sh ${PACKAGE_DIR_MACOS} - ./makeRelease.sh ${PACKAGE_DIR_MACOS}

2
src/cc/Makefile_rogue
View File

@@ -4,7 +4,7 @@ CC_DARWIN = g++-6
CC_WIN = x86_64-w64-mingw32-gcc-posix CC_WIN = x86_64-w64-mingw32-gcc-posix
CFLAGS_DARWIN = -DBUILD_ROGUE -std=c++11 -arch x86_64 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib CFLAGS_DARWIN = -DBUILD_ROGUE -std=c++11 -arch x86_64 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib
CFLAGS = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared CFLAGS = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
CFLAGS_WIN = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/x86_64-w64-mingw32/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared CFLAGS_WIN = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I./rogue/x86_64-w64-mingw32/include -I./rogue/x86_64-w64-mingw32/include/ncursesw -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
DEBUGFLAGS = -O0 -D _DEBUG DEBUGFLAGS = -O0 -D _DEBUG
RELEASEFLAGS = -O2 -D NDEBUG -combine -fwhole-program RELEASEFLAGS = -O2 -D NDEBUG -combine -fwhole-program
$(info $(OS)) $(info $(OS))

6
src/cc/makerogue
View File

@@ -5,12 +5,10 @@ make clean;
if [ "$HOST" = "x86_64-w64-mingw32" ]; then if [ "$HOST" = "x86_64-w64-mingw32" ]; then
echo building rogue.exe... echo building rogue.exe...
./configure --host=x86_64-w64-mingw32 ./configure --host=x86_64-w64-mingw32
mkdir ncurses && cd ncurses
echo $PWD echo $PWD
wget https://invisible-island.net/datafiles/release/mingw32.zip wget https://github.com/KomodoPlatform/rogue/releases/download/0.3.3b-01/x86_64-w64-mingw32.tar.gz
unzip mingw32.zip && rm mingw32.zip tar xvfz x86_64-w64-mingw32.tar.gz && rm x86_64-w64-mingw32.tar.gz
echo lib archive cleaned echo lib archive cleaned
cd ..
echo $PWD echo $PWD
if make -f Makefile_win "$@"; then if make -f Makefile_win "$@"; then
echo rogue.exe build SUCCESSFUL echo rogue.exe build SUCCESSFUL

4
src/cc/rogue/Makefile_win
View File

@@ -26,10 +26,10 @@ O=o
CC = x86_64-w64-mingw32-gcc CC = x86_64-w64-mingw32-gcc
#CFLAGS=-O2 #CFLAGS=-O2
CFLAGS= -g -O2 -I./ncurses/include -I./ncurses/include/ncursesw -I../../../depends/x86_64-w64-mingw32/include CFLAGS= -g -O2 -I./x86_64-w64-mingw32/include -I./x86_64-w64-mingw32/include/ncursesw
#LIBS=-lcurses #LIBS=-lcurses
LIBS = -L./ncurses/lib -lncursesw -lcurl LIBS = -L./x86_64-w64-mingw32/lib -lncursesw -lcurl
#RM=rm -f #RM=rm -f
RM = rm -f RM = rm -f