diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..2685289d40 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +language: c +before_install: + - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" + - echo "yes" | sudo apt-add-repository ppa:openmw/deps + - sudo apt-key update -qq + - sudo apt-get update -qq + - sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 libsdl2-static-dev libc6-dev-i386 + - ls -al /usr/bin + - ls -al /usr/include/SDL2 + - sudo mv /usr/include/SDL2 /usr/include/sdl2 +script: + - sudo find / -name SDL2 2>>/dev/null || true + - mkdir build + - pushd build && cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .. && popd + - sudo find / -name stubs-32.h 2>>/dev/null || true + - pushd build && C_INCLUDE_PATH=/usr/include/x86_64-linux-gnu/bits:/usr/include/sdl2:$C_INCLUDE_PATH make && popd +#notifications: + #irc: "irc.freenode.net#openrct2" diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt index 111ad06a48..1f92220945 100644 --- a/CMakeLists_mingw.txt +++ b/CMakeLists_mingw.txt @@ -16,15 +16,17 @@ 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") +INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu") +INCLUDE_DIRECTORIES("/usr/include/sdl2") # here is the target environment located SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX}) # adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search +# search headers and libraries in the target environment, search # programs in the host environment set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/src/editor.c b/src/editor.c index b1aac65f76..8c604bc726 100644 --- a/src/editor.c +++ b/src/editor.c @@ -35,6 +35,8 @@ static void set_all_land_owned(); +/*Syntax error blah blah blat *&2)*/ + /** * * rct2: 0x0066FFE1 @@ -184,4 +186,4 @@ void sub_6BD3A4() { RCT2_ADDRESS(0x013CA672, uint8)[i] = 1; } RCT2_CALLPROC_EBPSAFE(0x006C0C3F); -} \ No newline at end of file +}