Merge pull request #5 from cpp3ds/master

Travis CI script

.travis.yml

+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

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})