@@ -276,10 +276,7 @@ function do_build() {
276276 { set +x; } 2> /dev/null
277277
278278 # Copy libraries
279- # Organize by build type (release/debug) instead of variant name
280- local build_type_lower
281- build_type_lower=$( echo " $variant_build_type " | tr ' [:upper:]' ' [:lower:]' )
282- local variant_out_dir=" ${_OUT_DIR} /lib/${build_type_lower} "
279+ local variant_out_dir=" ${_OUT_DIR} /lib/${variant_name} "
283280 mkdir -p -- " $variant_out_dir "
284281 function copy_lib() {
285282 install -vD -m644 -- " ${variant_build_dir} /${1} " " ${variant_out_dir} /${2:- $(basename -- " $1 " )} "
@@ -308,20 +305,20 @@ function do_build() {
308305 build_variant debug Debug -DLIBMEM_BUILD_STATIC=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug
309306 ;;
310307 * -windows-gnu-msvcrt-shared)
311- build_variant release-shared Release -DLIBMEM_BUILD_STATIC=OFF
312- build_variant debug-shared Debug -DLIBMEM_BUILD_STATIC=OFF
308+ build_variant release Release -DLIBMEM_BUILD_STATIC=OFF
309+ build_variant debug Debug -DLIBMEM_BUILD_STATIC=OFF
313310 ;;
314311 * -windows-gnu-msvcrt-static)
315- build_variant release-static Release -DLIBMEM_BUILD_STATIC=ON
316- build_variant debug-static Debug -DLIBMEM_BUILD_STATIC=ON
312+ build_variant release Release -DLIBMEM_BUILD_STATIC=ON
313+ build_variant debug Debug -DLIBMEM_BUILD_STATIC=ON
317314 ;;
318315 * -windows-gnu-ucrt-shared)
319- build_variant release-shared Release -DLIBMEM_BUILD_STATIC=OFF
320- build_variant debug-shared Debug -DLIBMEM_BUILD_STATIC=OFF
316+ build_variant release Release -DLIBMEM_BUILD_STATIC=OFF
317+ build_variant debug Debug -DLIBMEM_BUILD_STATIC=OFF
321318 ;;
322319 * -windows-gnu-ucrt-static)
323- build_variant release-static Release -DLIBMEM_BUILD_STATIC=ON
324- build_variant debug-static Debug -DLIBMEM_BUILD_STATIC=ON
320+ build_variant release Release -DLIBMEM_BUILD_STATIC=ON
321+ build_variant debug Debug -DLIBMEM_BUILD_STATIC=ON
325322 ;;
326323 * -shared)
327324 build_variant ./ Release -DLIBMEM_BUILD_STATIC=OFF
0 commit comments