Skip to content

Commit 577eb9b

Browse files
committed
Update to appveyor with conan
This should be greatly simplify overall build process.
1 parent d6e8f73 commit 577eb9b

File tree

1 file changed

+13
-46
lines changed

1 file changed

+13
-46
lines changed

appveyor.yml

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,62 +13,29 @@ environment:
1313
platform:
1414
- x64
1515
- x86
16-
17-
# Avoid rebuilding external dependencies (ie. SDL and SDL_mixer)
18-
# Uncache build_ext if external deps change
16+
17+
# Avoid rebuilding external dependencies
1918
cache:
2019
- res/music.sf2
21-
- build_ext
22-
23-
# Set up environment variable values for 32 and 64 bit builds
2420

25-
for:
26-
-
27-
matrix:
28-
only:
29-
- platform: x86
30-
before_build:
31-
- set BUILD_SCRIPT=build_win32.sh
32-
- set ARTIFACT=systemshock-x86.zip
33-
- set MINGW_PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin\
34-
- copy CMakeLists.32bit.txt CMakeLists.txt
35-
-
36-
matrix:
37-
only:
38-
- platform: x64
39-
before_build:
40-
- set BUILD_SCRIPT=build_win64.sh
41-
- set ARTIFACT=systemshock-x64.zip
42-
- set MINGW_PATH=C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin\
43-
44-
# Actual build script..
45-
# Step 1: Git has to reside in a path without spaces because the SDL build script is weird like that.
46-
# So we create a symlink to the real Git, remove it from PATH and add our own.
47-
# Step 2: We need to use our own make.exe to build stuff, so we add that
48-
# Step 3: Do the actual building
21+
install:
22+
- cmd: set PATH=%PATH%;%PYTHON%/Scripts/
23+
- cmd: pip.exe install conan
24+
- cmd: conan user
25+
- cmd: conan --version
4926

5027
build_script:
51-
- mklink /D c:\git "C:\Program Files\Git"
52-
- set PATH=%PATH:C:\Program Files (x86)\Git\bin;=%
53-
- set PATH=c:\git\usr\bin;%PATH%;%MINGW_PATH%
54-
- copy windows\make.exe \git\usr\bin
55-
- set CMAKE_MAKE_PROGRAM=c:\git\usr\bin\make.exe
56-
- sh %BUILD_SCRIPT%
57-
- build.bat
28+
- cmd: mkdir build
29+
- cmd: cd build
30+
- cmd: conan install .. --build=missing
31+
- cmd: cmake .. -DENABLE_SDL2=BUNDLE -DENABLE_SOUND=BUNDLE -DENABLE_FLUIDSYNTH=BUNDLE -G "Ninja"
32+
- cmd: ninja -j2
5833

59-
6034
# For now, we don't have any automatic tests to run
61-
test: off
35+
test: false
6236

6337
# Once building is done, we gather all the necessary DLL files and build our ZIP file.
6438
after_build:
65-
- copy %MINGW_PATH%\libgcc*.dll .
66-
- copy %MINGW_PATH%\libstd*.dll .
67-
- copy %MINGW_PATH%\libwinpthread-1.dll .
68-
- copy build_ext\built_sdl\bin\SDL*.dll .
69-
- copy build_ext\built_sdl_mixer\bin\SDL*.dll .
70-
- copy build_ext\built_glew\lib\glew32.dll .
71-
- copy build_ext\fluidsynth-lite\src\libfluidsynth.dll .
7239
- 7z a %ARTIFACT% systemshock.exe *.dll shaders/ res/
7340

7441
artifacts:

0 commit comments

Comments
 (0)