Fixed library names for FLAC and portmidi

cmake-proxies/CMakeLists.txt

@@ -34,14 +34,7 @@ add_subdirectory( "libvorbis" )
 add_subdirectory( "lv2" )
 add_subdirectory( "mod-script-pipe" )
 add_subdirectory( "portaudio-v19" )
-
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.11)
-set(CMAKE_CACHEFILE_DIR ${CMAKE_BINARY_DIR})
-add_subdirectory( "${LIB_SRC_DIRECTORY}portmidi" "${CMAKE_CURRENT_BINARY_DIR}/portmidi" EXCLUDE_FROM_ALL )
-set_target_properties(portmidi-static PROPERTIES OSX_ARCHITECTURES "")
-cmake_policy(POP)
-
+add_subdirectory( "portmidi" )
 add_subdirectory( "portmixer" )
 #add_subdirectory( "portburn" ) # not built
 add_subdirectory( "portsmf" )

cmake-proxies/libflac/CMakeLists.txt

@@ -190,7 +190,8 @@ add_library(FLAC-static STATIC
     "${TARGET_SOURCE}/src/libFLAC/ogg_decoder_aspect.c"
     "${TARGET_SOURCE}/src/libFLAC/ogg_encoder_aspect.c"
     "${TARGET_SOURCE}/src/libFLAC/ogg_helper.c"
-    "${TARGET_SOURCE}/src/libFLAC/ogg_mapping.c")
+    "${TARGET_SOURCE}/src/libFLAC/ogg_mapping.c"
+    "$<$<BOOL:${WIN32}>:${TARGET_SOURCE}/src/share/win_utf8_io/win_utf8_io.c>")
 
 include_directories(
     "${TARGET_SOURCE}/include"
@@ -202,8 +203,11 @@ target_include_directories(FLAC-static INTERFACE
 target_link_libraries(FLAC-static PUBLIC
     libogg
     $<TARGET_NAME_IF_EXISTS:FLAC-asm>
-    $<$<BOOL:${HAVE_LROUND}>:m>)
-set_target_properties(FLAC-static PROPERTIES OSX_ARCHITECTURES "")
+    $<$<BOOL:${HAVE_LROUND}>:m>
+    $<TARGET_NAME_IF_EXISTS:win_utf8_io>)
+set_target_properties(FLAC-static PROPERTIES
+    OSX_ARCHITECTURES ""
+    OUTPUT_NAME libflac)
 
 add_library(FLACXX-static STATIC
     "${TARGET_SOURCE}/src/libFLAC++/metadata.cpp"
@@ -213,4 +217,6 @@ target_compile_definitions(FLACXX-static PUBLIC FLAC__NO_DLL)
 target_include_directories(FLACXX-static INTERFACE
     "$<BUILD_INTERFACE:${TARGET_SOURCE}/include>")
 target_link_libraries(FLACXX-static PUBLIC FLAC-static)
-set_target_properties(FLACXX-static PROPERTIES OSX_ARCHITECTURES "")
+set_target_properties(FLACXX-static PROPERTIES
+    OSX_ARCHITECTURES ""
+    OUTPUT_NAME libflac++)

cmake-proxies/portmidi/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8.11)
+
+set(TARGET portmidi)
+set(TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET})
+
+set(CMAKE_CACHEFILE_DIR ${CMAKE_BINARY_DIR})
+add_subdirectory( "${TARGET_SOURCE}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}" EXCLUDE_FROM_ALL )
+set_target_properties(portmidi-static PROPERTIES
+    OSX_ARCHITECTURES ""
+    OUTPUT_NAME ${TARGET})

cmake-proxies/portmixer/CMakeLists.txt

@@ -20,7 +20,7 @@ add_library(${TARGET} STATIC
 
 
 target_compile_definitions(${TARGET} PRIVATE
-    $<$<BOOL:${WIN32}>:PX_USE_WIN_DSOUND>
+#   $<$<BOOL:${WIN32}>:PX_USE_WIN_DSOUND>
     $<$<BOOL:${WIN32}>:PX_USE_WIN_MME>
     $<$<BOOL:${WIN32}>:PX_USE_WIN_WASAPI>
     $<$<IN_LIST:PA_USE_ALSA=1,${PA_DEFINITIONS}>:PX_USE_LINUX_ALSA>