diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f36b07..a48b4dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,8 +106,7 @@ jobs: if: matrix.config.mode == 'Release' run: | mkdir dist - mv client dist - mv profile dist + mv web dist mv .\build\osr-extract.exe dist mv .\build\osr-backend.exe dist cd dist @@ -294,8 +293,7 @@ jobs: if: matrix.config.artifact run: | mkdir osr - mv client osr/client - mv profile osr/profile + mv web osr/web mv build/osr-extract osr/osr-extract mv build/osr-backend osr/osr-backend tar cjf osr-${{ matrix.config.artifact }}.tar.bz2 osr diff --git a/CMakeLists.txt b/CMakeLists.txt index 870cc8e..5149445 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,7 @@ if (MSVC) string(REPLACE "/Zi" "${OSR_MSVC_DEBUG_FLAGS}" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") string(REPLACE "/Zi" "${OSR_MSVC_DEBUG_FLAGS}" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") string(REPLACE "/Zi" "${OSR_MSVC_DEBUG_FLAGS}" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + add_definitions(_CRT_SECURE_NO_WARNINGS=1) endif () if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)