diff --git a/.github/workflows/macosx-clang-build.yml b/.github/workflows/macosx-clang-build.yml index 1cc1aa1..1b8f090 100644 --- a/.github/workflows/macosx-clang-build.yml +++ b/.github/workflows/macosx-clang-build.yml @@ -2,7 +2,7 @@ name: macosx-clang-build on: push: - branches: [ main ] + branches: [ main, dev ] pull_request: branches: [ main ] diff --git a/.github/workflows/ubuntu-gcc-build.yml b/.github/workflows/ubuntu-gcc-build.yml index c3a71df..3752361 100644 --- a/.github/workflows/ubuntu-gcc-build.yml +++ b/.github/workflows/ubuntu-gcc-build.yml @@ -2,7 +2,7 @@ name: ubuntu-gcc-build on: push: - branches: [ main ] + branches: [ main, dev ] pull_request: branches: [ main ] diff --git a/.github/workflows/windows-mingw-build.yml b/.github/workflows/windows-mingw-build.yml index 82bf878..d272729 100644 --- a/.github/workflows/windows-mingw-build.yml +++ b/.github/workflows/windows-mingw-build.yml @@ -2,7 +2,7 @@ name: windows-mingw-build on: push: - branches: [ main ] + branches: [ main, dev ] pull_request: branches: [ main ] diff --git a/.github/workflows/windows-msvc-build.yml b/.github/workflows/windows-msvc-build.yml index 3ab6ae1..aa84f75 100644 --- a/.github/workflows/windows-msvc-build.yml +++ b/.github/workflows/windows-msvc-build.yml @@ -2,7 +2,7 @@ name: windows-msvc-build on: push: - branches: [ main ] + branches: [ main, dev ] pull_request: branches: [ main ] diff --git a/CMakeLists.txt b/CMakeLists.txt index d859334..84c3fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,9 @@ project(seika C) option(IS_CI_BUILD "" OFF) option(SEIKA_STATIC_LIB "Make seika and dependent libs static" OFF) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + if (CMAKE_C_COMPILER_ID STREQUAL "MSVC") list(APPEND flags "/W3" "/Zc:preprocessor") elseif (APPLE)