diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-28 17:57:12 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-28 17:57:12 +0200 |
| commit | d45b14fc66b129eead6125ee549131182eb28374 (patch) | |
| tree | db7d870e59d04ddfb21f5bfd3919c2a364da4da5 | |
| parent | added virtual address conversion for firmware FW0B (diff) | |
| parent | Need to add Xcursor to linker? (diff) | |
| download | yuzu-d45b14fc66b129eead6125ee549131182eb28374.tar yuzu-d45b14fc66b129eead6125ee549131182eb28374.tar.gz yuzu-d45b14fc66b129eead6125ee549131182eb28374.tar.bz2 yuzu-d45b14fc66b129eead6125ee549131182eb28374.tar.lz yuzu-d45b14fc66b129eead6125ee549131182eb28374.tar.xz yuzu-d45b14fc66b129eead6125ee549131182eb28374.tar.zst yuzu-d45b14fc66b129eead6125ee549131182eb28374.zip | |
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..8bad122b2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: cpp +compiler: + - gcc +before_install: + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get -qq update + - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 + - git clone https://github.com/glfw/glfw.git + - "mkdir glfw/build && cd glfw/build && cmake .. && make && sudo make install ; cd -" +script: + - mkdir build && cd build + - cmake .. + - make -j4
\ No newline at end of file diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 0023da2bf..147f51e94 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -7,6 +7,6 @@ if (NOT X11_xf86vmode_LIB) endif() add_executable(citra ${SRCS}) -target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) +target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |