From 79b1f7131792eac6467994d9e70af28fd031e9b4 Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Sat, 24 May 2014 12:24:57 +0900 Subject: [PATCH] just hardcode it --- .travis.yml | 2 +- CMakeLists_mingw.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f671cd4bf..43d9b7428c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,6 @@ script: - sudo find / -name SDL2 2>>/dev/null || true - echo "Hello World" - mkdir build - - pushd build; SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .. ; popd + - pushd build && SDL_INCLUDE_DIRS=/usr/include/SDL2 cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .. && popd #notifications: #irc: "irc.freenode.net#openrct2" diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt index 2a6991bf95..cb8efc8f9c 100644 --- a/CMakeLists_mingw.txt +++ b/CMakeLists_mingw.txt @@ -16,9 +16,9 @@ set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc" CACHE STRING "" FORCE) include_directories("/usr/include/wine/windows/") # find and include SDL2 -INCLUDE(FindPkgConfig) -PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) -INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS}) +# INCLUDE(FindPkgConfig) +# PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) +INCLUDE_DIRECTORIES("/usr/include/sdl2") # here is the target environment located SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX})