Skip to content

Commit 506a227

Browse files
committed
0.9.0
1 parent 515801c commit 506a227

40 files changed

+9690
-480
lines changed

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
"configurePreset": "windows-x64",
143143
"displayName": "Windows x64",
144144
"description": "Windows build for x64",
145-
"configuration": "RelWithDebInfo"
145+
"configuration": "Debug"
146146
},
147147
{
148148
"name": "windows-ci-x64",

buildspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"uuids": {
4444
"windowsApp": "ad885c58-5ca9-44de-8f4f-1c12676626a9"
4545
},
46-
"version": "0.8.0",
46+
"version": "0.9.0",
4747
"website": "https://www.atkaudio.com"
4848
}

lib/atkaudio/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ if(MSVC)
5858
target_compile_options(
5959
${PROJECT_NAME}
6060
PRIVATE
61+
/wd4244
6162
/wd4267
6263
/wd5105
6364
)

lib/atkaudio/cmake/cpack.cmake

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,57 +31,49 @@ set(ICON_PATH "${CMAKE_SOURCE_DIR}/lib/atkaudio/assets/icon.ico")
3131
file(TO_CMAKE_PATH "${ICON_PATH}" ICON_PATH)
3232
file(TO_NATIVE_PATH "${ICON_PATH}" ICON_PATH)
3333
string(REPLACE "\\" "\\\\" ICON_PATH "${ICON_PATH}")
34-
set(CPACK_NSIS_MUI_ICON "${ICON_PATH}")
35-
set(CPACK_NSIS_MUI_UNIICON "${ICON_PATH}")
34+
set(CPACK_NSIS_MUI_ICON "${ICON_PATH}")
35+
set(CPACK_NSIS_MUI_UNIICON "${ICON_PATH}")
3636
set(CPACK_PACKAGE_ICON "${ICON_PATH}")
3737

3838
if(WIN32)
39-
set(CPACK_GENERATOR "NSIS")
40-
set(CPACK_PACKAGE_INSTALL_DIRECTORY " ") # for some reason this is required for NSIS
41-
set(CPACK_PACKAGE_EXTENSION "exe")
39+
set(CPACK_GENERATOR "NSIS")
40+
set(CPACK_PACKAGE_INSTALL_DIRECTORY " ") # for some reason this is required for NSIS
41+
set(CPACK_PACKAGE_EXTENSION "exe")
4242
else()
43-
set(CPACK_GENERATOR "productbuild")
44-
set(CPACK_PACKAGE_EXTENSION "pkg")
43+
set(CPACK_GENERATOR "productbuild")
44+
set(CPACK_PACKAGE_EXTENSION "pkg")
4545
endif()
4646

47-
if(UNIX AND NOT APPLE)
48-
47+
if(NOT DEFINED ENV{CI})
48+
return()
4949
endif()
50-
5150
if(NOT WIN32)
52-
return()
51+
return()
5352
endif()
5453

55-
5654
set(CPACK_RELEASE_STAGING_DIRECTORY "${CMAKE_SOURCE_DIR}/release")
57-
set(BUILD_TYPE_FOR_CPACK "RelWithDebInfo")
58-
if(NOT EXISTS ${CMAKE_BINARY_DIR}/${BUILD_TYPE_FOR_CPACK})
59-
set(BUILD_TYPE_FOR_CPACK "Debug")
60-
endif()
61-
if(DEFINED ENV{CI})
62-
set(BUILD_TYPE_FOR_CPACK "Release")
63-
endif()
55+
set(BUILD_TYPE_FOR_CPACK "Release")
6456

6557
set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}")
6658
set(CPACK_PACKAGE_ABSOLUTE_PATH ${CPACK_PACKAGE_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.${CPACK_PACKAGE_EXTENSION})
6759

6860
include(CPack)
6961

7062
if(NOT EXISTS ${CPACK_PACKAGE_ABSOLUTE_PATH})
71-
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
63+
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
7264
COMMAND cpack --config CPackConfig.cmake -C ${BUILD_TYPE_FOR_CPACK}
7365
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
7466
)
7567
endif()
7668

7769
# hack
7870
# Copy the package to the release staging directory
79-
install(CODE
71+
install(CODE
8072
"
8173
if(EXISTS \"${CPACK_PACKAGE_ABSOLUTE_PATH}\" AND EXISTS \"${CPACK_RELEASE_STAGING_DIRECTORY}\")
8274
message(STATUS \"Copying package to release staging directory: ${CPACK_RELEASE_STAGING_DIRECTORY}\")
8375
file(COPY \"${CPACK_PACKAGE_ABSOLUTE_PATH}\" DESTINATION \"${CPACK_RELEASE_STAGING_DIRECTORY}\")
8476
endif()
8577
"
8678
)
87-
79+

lib/atkaudio/src/atkaudio/DeviceIo/AudioAppDemo.h

Lines changed: 0 additions & 266 deletions
This file was deleted.

0 commit comments

Comments
 (0)