From e492a253d9ae8cd07cc414873372cad5c198eb4f Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 12:32:13 -0400 Subject: [PATCH 1/7] Added Travis CI script --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..9c6c6e0169 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe" + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get -qq update + - sudo apt-get -qq install libgtest-dev g++-4.8 xorg-dev libglu1-mesa-dev + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 + - git clone https://github.com/glfw/glfw.git + - "cd glfw && mkdir build && cd build && cmake .. && make && sudo make install ; cd -" + - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -" +script: + - mkdir build && cd build + - cmake .. + - make -j4 \ No newline at end of file From 5c768453630d873489a514728c73a4c49c2295a7 Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 12:39:49 -0400 Subject: [PATCH 2/7] Remove potentially unnecessary lines in Travis script. --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c6c6e0169..51c19a2889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: cpp compiler: - gcc before_install: - - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe" - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get -qq update - sudo apt-get -qq install libgtest-dev g++-4.8 xorg-dev libglu1-mesa-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 @@ -11,6 +9,5 @@ before_install: - "cd glfw && mkdir build && cd build && cmake .. && make && sudo make install ; cd -" - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -" script: - - mkdir build && cd build - - cmake .. + - cmake . - make -j4 \ No newline at end of file From ac4947bb68899853f3e5bb75218d56e057476cc4 Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 12:43:11 -0400 Subject: [PATCH 3/7] One of the lines wasn't quite unneccesary. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 51c19a2889..6ef2477c07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ 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 libgtest-dev g++-4.8 xorg-dev libglu1-mesa-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 From 322efe83faf2d37fc4e73c6193d54ed2c7da0cf2 Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 12:52:01 -0400 Subject: [PATCH 4/7] Fixed travis dir problem (third time's the charm) --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ef2477c07..db3554e19a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ compiler: before_install: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get -qq update - - sudo apt-get -qq install libgtest-dev g++-4.8 xorg-dev libglu1-mesa-dev + - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 - git clone https://github.com/glfw/glfw.git - - "cd glfw && mkdir build && cd build && cmake .. && make && sudo make install ; cd -" - - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -" + - "mkdir glfw/build && cd glfw/build && cmake .. && make && sudo make install ; cd -" script: - - cmake . + - mkdir build && cd build + - cmake .. - make -j4 \ No newline at end of file From c08cec14e1ac55d9336a5574e8fe1e3176235b34 Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 21:54:09 -0400 Subject: [PATCH 5/7] Maybe needs libglew-dev? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db3554e19a..1a6874b544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ compiler: 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 + - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-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 -" From 149503d249c1dee4d05c740d23b535f1139a902c Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 22:04:18 -0400 Subject: [PATCH 6/7] Yet anothing missing dependency? libxcursor-dev --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a6874b544..8bad122b26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ compiler: 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 + - 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 -" From a226dc57bf7ec7d3c6b32f2ec489fdca313732d5 Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Fri, 25 Apr 2014 23:01:58 -0400 Subject: [PATCH 7/7] Need to add Xcursor to linker? --- src/citra/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 0023da2bf4..147f51e943 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})