From 70444c2299d2e1c312aa1f8c82bc63c7974605a8 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 20 Dec 2017 20:26:57 +0100 Subject: [PATCH] We don't use mixer so don't include it. Also an attempt to download lua with appveyor --- .appveyor.yml | 97 +++++++++++++++++++++++++++----------------------- CMakeLists.txt | 3 -- 2 files changed, 52 insertions(+), 48 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 153b8c3..9b9e32c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,58 +2,65 @@ version: '{branch}.{build}' os: Visual Studio 2015 clone_depth: 1 cache: - - c:\freshmingw - - c:\usr + - c:\freshmingw + - c:\usr before_build: - - |- - set PREFIX=C:\usr - set ARCH=i686-w64-mingw32 + - |- + set PREFIX=C:\usr + set ARCH=i686-w64-mingw32 - # depends are only fetched where there's no cache - - if exist %PREFIX% set DEPENDS=rem + # depends are only fetched where there's no cache + - if exist %PREFIX% set DEPENDS=rem - - |- - %DEPENDS% mkdir %PREFIX%\include\SDL2 - %DEPENDS% mkdir %PREFIX%\lib - %DEPENDS% cd %TEMP% + - |- + %DEPENDS% mkdir %PREFIX%\include\SDL2 + %DEPENDS% mkdir %PREFIX%\lib + %DEPENDS% cd %TEMP% - # SDL2 - - |- - %DEPENDS% appveyor DownloadFile http://www.libsdl.org/release/SDL2-devel-2.0.7-mingw.tar.gz - %DEPENDS% 7z x SDL2-devel-2.0.7-mingw.tar.gz > nul - %DEPENDS% 7z x SDL2-devel-2.0.7-mingw.tar > nul - %DEPENDS% copy SDL2-2.0.7\%ARCH%\include\SDL2\* %PREFIX%\include\SDL2 > nul - %DEPENDS% copy SDL2-2.0.7\%ARCH%\lib\*.a %PREFIX%\lib > nul - %DEPENDS% copy SDL2-2.0.7\%ARCH%\bin\*.dll %PREFIX%\lib > nul + # SDL2 + - |- + %DEPENDS% appveyor DownloadFile http://www.libsdl.org/release/SDL2-devel-2.0.7-mingw.tar.gz + %DEPENDS% 7z x SDL2-devel-2.0.7-mingw.tar.gz > nul + %DEPENDS% 7z x SDL2-devel-2.0.7-mingw.tar > nul + %DEPENDS% copy SDL2-2.0.7\%ARCH%\include\SDL2\* %PREFIX%\include\SDL2 > nul + %DEPENDS% copy SDL2-2.0.7\%ARCH%\lib\*.a %PREFIX%\lib > nul + %DEPENDS% copy SDL2-2.0.7\%ARCH%\bin\*.dll %PREFIX%\lib > nul - # SDL2_image - - |- - %DEPENDS% appveyor DownloadFile http://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.2-mingw.tar.gz - %DEPENDS% 7z x SDL2_image-devel-2.0.2-mingw.tar.gz > nul - %DEPENDS% 7z x SDL2_image-devel-2.0.2-mingw.tar > nul - %DEPENDS% copy SDL2_image-2.0.2\%ARCH%\include\SDL2\* %PREFIX%\include\SDL2 > nul - %DEPENDS% copy SDL2_image-2.0.2\%ARCH%\lib\*.a %PREFIX%\lib > nul - %DEPENDS% copy SDL2_image-2.0.2\%ARCH%\bin\*.dll %PREFIX%\lib > nul + # SDL2_image + - |- + %DEPENDS% appveyor DownloadFile http://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.2-mingw.tar.gz + %DEPENDS% 7z x SDL2_image-devel-2.0.2-mingw.tar.gz > nul + %DEPENDS% 7z x SDL2_image-devel-2.0.2-mingw.tar > nul + %DEPENDS% copy SDL2_image-2.0.2\%ARCH%\include\SDL2\* %PREFIX%\include\SDL2 > nul + %DEPENDS% copy SDL2_image-2.0.2\%ARCH%\lib\*.a %PREFIX%\lib > nul + %DEPENDS% copy SDL2_image-2.0.2\%ARCH%\bin\*.dll %PREFIX%\lib > nul - # SDL2_ttf - - |- - %DEPENDS% appveyor DownloadFile https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.14-mingw.tar.gz - %DEPENDS% 7z x SDL2_ttf-devel-2.0.14-mingw.tar.gz > nul - %DEPENDS% 7z x SDL2_ttf-devel-2.0.14-mingw.tar > nul - %DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\include\SDL2\* %PREFIX%\include\SDL2 > nul - %DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\lib\*.a %PREFIX%\lib > nul - %DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\bin\*.dll %PREFIX%\lib > nul + # SDL2_ttf + - |- + %DEPENDS% appveyor DownloadFile https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.14-mingw.tar.gz + %DEPENDS% 7z x SDL2_ttf-devel-2.0.14-mingw.tar.gz > nul + %DEPENDS% 7z x SDL2_ttf-devel-2.0.14-mingw.tar > nul + %DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\include\SDL2\* %PREFIX%\include\SDL2 > nul + %DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\lib\*.a %PREFIX%\lib > nul + %DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\bin\*.dll %PREFIX%\lib > nul + + # Lua + - |- + %DEPENDS% appveyor DownloadFile https://sourceforge.net/projects/luabinaries/files/5.3.4/Windows%20Libraries/Static/lua-5.3.4_Win64_vc14_lib.zip/download?use_mirror=netix + %DEPENDS% 7z x lua-5.3.4_Win64_vc14_lib.zip > nul + %DEPENDS% copy include\* %PREFIX%\include > nul + %DEPENDS% copy lua53.lib %PREFIX%\lib > nul build_script: - - |- - set Path=C:\MinGW\bin;%Path% - cd %APPVEYOR_BUILD_FOLDER% - del "C:\Program Files\Git\usr\bin\sh.exe" + - |- + set Path=C:\MinGW\bin;%Path% + cd %APPVEYOR_BUILD_FOLDER% + del "C:\Program Files\Git\usr\bin\sh.exe" - # Build - - |- - cmake --version - cmake -DCMAKE_PREFIX_PATH="%PREFIX%" -DCMAKE_C_COMPILER=mingw32-gcc.exe -DCMAKE_CXX_COMPILER=mingw32-c++.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSTANDALONE=ON -DCMAKE_INSTALL_PREFIX="C:\breakhack" -G "MinGW Makefiles" + # Build + - |- + cmake --version + cmake -DCMAKE_PREFIX_PATH="%PREFIX%" -DCMAKE_C_COMPILER=mingw32-gcc.exe -DCMAKE_CXX_COMPILER=mingw32-c++.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSTANDALONE=ON -DCMAKE_INSTALL_PREFIX="C:\breakhack" -G "MinGW Makefiles" - - |- - mingw32-make + - |- + mingw32-make diff --git a/CMakeLists.txt b/CMakeLists.txt index 748e52b..95871e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ project(breakhack C) include(FindLua) include(cmake/FindSDL2.cmake) include(cmake/FindSDL2_image.cmake) -include(cmake/FindSDL2_mixer.cmake) include(cmake/FindSDL2_ttf.cmake) configure_file( @@ -25,7 +24,6 @@ include_directories( ${LUA_INCLUDE_DIR} ${SDL2_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR} - ${SDL2_MIXER_INCLUDE_DIR} ${SDL2_TTF_INCLUDE_DIR} ) @@ -66,7 +64,6 @@ target_link_libraries(breakhack ${LUA_LIBRARY} ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} - ${SDL2_MIXER_LIBRARY} ${SDL2_TTF_LIBRARY} )