separate branches deploy to separate folders

.travis.yml

@@ -28,7 +28,7 @@ before_deploy:
 deploy:
   provider: s3
   local_dir: out
-  upload-dir: travis
+  upload-dir: travis-$TRAVIS_BRANCH
   skip_cleanup: true
   bucket: "pogger-space"
   access_key_id: $S3_ACCESS_KEY

CMakeLists.txt

@@ -15,6 +15,9 @@ if(NOT USE_PKGCONFIG)
 	link_libraries(${GTKMM_LIBRARY})
 	include_directories(${GTKMM_INCLUDE_DIRS})
 
+	find_library(GLIB_LIBRARY glib-2.0)
+	link_libraries(${GLIB_LIBRARY})
+
 	find_path(GLIBMM_INCLUDE_DIRS glibmm.h)
 	find_library(GLIBMM_LIBRARY glibmm)
 	link_libraries(${GLIBMM_LIBRARY})
@@ -192,3 +195,4 @@ target_link_libraries(abaddon ${GLIBMM_LIBRARIES})
 target_link_libraries(abaddon ${SIGC_LIBRARIES})
 target_link_libraries(abaddon ${ATKMM_LIBRARIES})
 target_link_libraries(abaddon ${GIOMM_LIBRARIES})
+target_link_libraries(abaddon ${GDK_LIBRARIES})

README.md

@@ -17,7 +17,7 @@
 
 ### Downloads (from CI):
 - Windows: [here](https://ci.appveyor.com/project/lorpus/abaddon/build/artifacts)
-- OSX: [here](https://i.owo.okinawa/travis/abaddon) (downloading css from here is still necessary)
+- OSX: [here](https://i.owo.okinawa/travis-master/abaddon) (downloading css/ and res/ from here is still necessary)
 
 #### Dependencies:  
 * [gtkmm](https://www.gtkmm.org/en/)