walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

We don't use mixer so don't include it. 

Also an attempt to download lua with appveyor
This commit is contained in:
Linus Probert 2017-12-20 20:26:57 +01:00
parent a69d8b2d46
commit 70444c2299
2 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.appveyor.yml
View File

@ -44,6 +44,13 @@ before_build:
%DEPENDS% copy SDL2_ttf-2.0.14\%ARCH%\lib\*.a %PREFIX%\lib > 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 %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: build_script:
- |- - |-
set Path=C:\MinGW\bin;%Path% set Path=C:\MinGW\bin;%Path%

3
CMakeLists.txt
View File

@ -7,7 +7,6 @@ project(breakhack C)
include(FindLua) include(FindLua)
include(cmake/FindSDL2.cmake) include(cmake/FindSDL2.cmake)
include(cmake/FindSDL2_image.cmake) include(cmake/FindSDL2_image.cmake)
include(cmake/FindSDL2_mixer.cmake)
include(cmake/FindSDL2_ttf.cmake) include(cmake/FindSDL2_ttf.cmake)
configure_file( configure_file(
@ -25,7 +24,6 @@ include_directories(
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}
${SDL2_IMAGE_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR}
${SDL2_MIXER_INCLUDE_DIR}
${SDL2_TTF_INCLUDE_DIR} ${SDL2_TTF_INCLUDE_DIR}
) )
@ -66,7 +64,6 @@ target_link_libraries(breakhack
${LUA_LIBRARY} ${LUA_LIBRARY}
${SDL2_LIBRARY} ${SDL2_LIBRARY}
${SDL2_IMAGE_LIBRARY} ${SDL2_IMAGE_LIBRARY}
${SDL2_MIXER_LIBRARY}
${SDL2_TTF_LIBRARY} ${SDL2_TTF_LIBRARY}
) )