diff options
author | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-10-29 19:15:58 -0400 |
---|---|---|
committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2020-10-29 19:15:58 -0400 |
commit | a5c9476eb497a742ce82d186d3471b1b685c632b (patch) | |
tree | 7409b67c4346872b1ccff703bea7a862b7434f62 | |
parent | dfc2fb1cd834f23bc16db48c9f2097d2e6242ead (diff) | |
download | abaddon-portaudio-a5c9476eb497a742ce82d186d3471b1b685c632b.tar.gz abaddon-portaudio-a5c9476eb497a742ce82d186d3471b1b685c632b.zip |
separate branches deploy to separate folders
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | README.md | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index b2219f9..3b221d2 100644 --- a/.travis.yml +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index d5b347f..2ec87a6 100644 --- a/CMakeLists.txt +++ b/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}) @@ -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/) |