Skip to content

Commit 8b17fd2

Browse files
committed
- appveyor fix
1 parent 1afd1c7 commit 8b17fd2

File tree

7 files changed

+18
-7
lines changed

7 files changed

+18
-7
lines changed

.appveyor/Build.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22

33
cd %project_folder%
4+
45
set SDL2_DIR=%windows_sdl2_dir%
56

67
premake5 vs2019

.appveyor/Install.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ appveyor DownloadFile %windows_premake_url% -FileName premake5.zip
44
7z x premake5.zip -o%project_folder% -aoa
55

66
appveyor DownloadFile %windows_sdl2_url% -FileName SDL2.zip
7-
7z x SDL2.zip -o%dependency_folder%
7+
7z x SDL2.zip -o%dependency_folder%

.appveyor/Install.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ cd "$APPVEYOR_BUILD_FOLDER"
88
curl "$linux_premake_url" -Lo premake5.tar.gz
99
tar xvf premake5.tar.gz
1010

11+
sudo apt-get update
12+
1113
sudo apt-get install -qq \
14+
libsdl2-dev \
1215
g++-multilib -y \
13-
libsdl2-dev
1416

Driver2CutsceneTool/cutscene_tool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ void PackCutsceneFile(const char* foldername)
326326

327327
// shrink size
328328
repsizes[i] -= sizeof(PLAYBACKCAMERA) * MAX_REPLAY_CAMERAS;
329-
MsgAccept("\Shinking '%s', now %d bytes\n", folderPath, repsizes[i]);
329+
MsgAccept("\tShrinking '%s', now %d bytes\n", folderPath, repsizes[i]);
330330
}
331331
}
332332
else

Driver2MissionTool/mission_tool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int main(int argc, char** argv)
5151
if (!stricmp(argv[i], "-compile"))
5252
{
5353
if (i + 1 <= argc)
54-
CompileMission(argv[i + 1]);
54+
CompileMissionBlk(argv[i + 1]);
5555
else
5656
MsgWarning("-compile must have an argument!");
5757
}

DriverLevelTool/premake5.lua

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
-- premake5.lua
22

3+
-- you can redefine dependencies
4+
SDL2_DIR = os.getenv("SDL2_DIR") or "../dependencies/SDL2"
5+
36
project "DriverLevelTool"
47
kind "ConsoleApp"
58
language "C++"
@@ -23,18 +26,22 @@ project "DriverLevelTool"
2326
"-Wno-narrowing",
2427
"-fpermissive",
2528
}
29+
links {
30+
"GL",
31+
"SDL2",
32+
}
2633

2734
cppdialect "C++11"
2835

2936
filter "system:windows"
3037
includedirs {
31-
"../"..SDL2_DIR.."/include"
38+
SDL2_DIR.."/include"
3239
}
3340
links {
3441
"SDL2",
3542
}
3643
libdirs {
37-
"../"..SDL2_DIR.."/lib/x86",
44+
SDL2_DIR.."/lib/x86",
3845
}
3946

4047

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ image:
1313

1414
environment:
1515
project_folder: '%APPVEYOR_BUILD_FOLDER%'
16+
dependency_folder: '%APPVEYOR_BUILD_FOLDER%\dependencies'
17+
windows_sdl2_dir: '%dependency_folder%\SDL2-2.0.12'
1618
# Dependency URLs
1719
windows_premake_url: 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-windows.zip'
1820
windows_sdl2_url: 'https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip'
1921
linux_premake_url: 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-linux.tar.gz'
2022

21-
2223
install:
2324
- cmd: '%APPVEYOR_BUILD_FOLDER%\.appveyor\Install.bat'
2425
- sh: '${APPVEYOR_BUILD_FOLDER}/.appveyor/Install.sh'

0 commit comments

Comments
 (0)