diff --git a/cmake-proxies/expat/CMakeLists.txt b/cmake-proxies/expat/CMakeLists.txt
index f450aa870..f23d61ba1 100644
--- a/cmake-proxies/expat/CMakeLists.txt
+++ b/cmake-proxies/expat/CMakeLists.txt
@@ -4,39 +4,44 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}expat/amiga/expat_68k.c
-${LIB_SRC_DIRECTORY}expat/amiga/expat_68k_handler_stubs.c
-${LIB_SRC_DIRECTORY}expat/amiga/expat_lib.c
-${LIB_SRC_DIRECTORY}expat/amiga/expat_vectors.c
-${LIB_SRC_DIRECTORY}expat/amiga/launch.c
-${LIB_SRC_DIRECTORY}expat/examples/elements.c
-${LIB_SRC_DIRECTORY}expat/examples/outline.c
+#${LIB_SRC_DIRECTORY}expat/amiga/expat_68k.c
+#${LIB_SRC_DIRECTORY}expat/amiga/expat_68k_handler_stubs.c
+#${LIB_SRC_DIRECTORY}expat/amiga/expat_lib.c
+#${LIB_SRC_DIRECTORY}expat/amiga/expat_vectors.c
+#${LIB_SRC_DIRECTORY}expat/amiga/launch.c
+#${LIB_SRC_DIRECTORY}expat/examples/elements.c
+#${LIB_SRC_DIRECTORY}expat/examples/outline.c
+
 ${LIB_SRC_DIRECTORY}expat/lib/xmlparse.c
 ${LIB_SRC_DIRECTORY}expat/lib/xmlrole.c
 ${LIB_SRC_DIRECTORY}expat/lib/xmltok.c
 ${LIB_SRC_DIRECTORY}expat/lib/xmltok_impl.c
 ${LIB_SRC_DIRECTORY}expat/lib/xmltok_ns.c
-${LIB_SRC_DIRECTORY}expat/tests/chardata.c
-${LIB_SRC_DIRECTORY}expat/tests/minicheck.c
-${LIB_SRC_DIRECTORY}expat/tests/runtests.c
-${LIB_SRC_DIRECTORY}expat/tests/benchmark/benchmark.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/codepage.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/ct.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/readfilemap.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/unixfilemap.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/win32filemap.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/xmlfile.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/xmlmime.c
-${LIB_SRC_DIRECTORY}expat/xmlwf/xmlwf.c
+
+#${LIB_SRC_DIRECTORY}expat/tests/chardata.c
+#${LIB_SRC_DIRECTORY}expat/tests/minicheck.c
+#${LIB_SRC_DIRECTORY}expat/tests/runtests.c
+#${LIB_SRC_DIRECTORY}expat/tests/benchmark/benchmark.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/codepage.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/ct.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/readfilemap.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/unixfilemap.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/win32filemap.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/xmlfile.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/xmlmime.c
+#${LIB_SRC_DIRECTORY}expat/xmlwf/xmlwf.c
 
 #${LIB_SRC_DIRECTORY}expat/tests/runtestspp.cpp
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB 
+-DCOMPILED_FROM_DSP
+)
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/lib
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libflac++/CMakeLists.txt b/cmake-proxies/libflac++/CMakeLists.txt
index c979a9c77..c7efabe51 100644
--- a/cmake-proxies/libflac++/CMakeLists.txt
+++ b/cmake-proxies/libflac++/CMakeLists.txt
@@ -1,26 +1,30 @@
 #directory cmake-proxies/libflac++
 #UNUSED
 set( TARGET libflac++ )
-set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
+set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}libflac )
 project( ${TARGET} )
 
 set( SOURCES 
 ${LIB_SRC_DIRECTORY}libflac/src/libFLAC++/metadata.cpp
 ${LIB_SRC_DIRECTORY}libflac/src/libFLAC++/stream_decoder.cpp
 ${LIB_SRC_DIRECTORY}libflac/src/libFLAC++/stream_encoder.cpp
-${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/decoders.cpp
-${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/encoders.cpp
-${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/main.cpp
-${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/metadata.cpp
-${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/metadata_manip.cpp
-${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/metadata_object.cpp
+#${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/decoders.cpp
+#${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/encoders.cpp
+#${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/main.cpp
+#${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/metadata.cpp
+#${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/metadata_manip.cpp
+#${LIB_SRC_DIRECTORY}libflac/src/test_libFLAC++/metadata_object.cpp
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
+add_definitions( 
+-DFLAC__NO_DLL
+-D_LIB
+ )
+
 add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libflac/CMakeLists.txt b/cmake-proxies/libflac/CMakeLists.txt
index 84d3e6ab7..e7a5d505f 100644
--- a/cmake-proxies/libflac/CMakeLists.txt
+++ b/cmake-proxies/libflac/CMakeLists.txt
@@ -1,5 +1,4 @@
 #directory cmake-proxies/libflac
-#UNUSED
 set( TARGET libflac )
 set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
diff --git a/cmake-proxies/libid3tag/CMakeLists.txt b/cmake-proxies/libid3tag/CMakeLists.txt
index d9362eb19..05e01b8ff 100644
--- a/cmake-proxies/libid3tag/CMakeLists.txt
+++ b/cmake-proxies/libid3tag/CMakeLists.txt
@@ -23,11 +23,16 @@ ${LIB_SRC_DIRECTORY}libid3tag/util.c
 ${LIB_SRC_DIRECTORY}libid3tag/version.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+)
+add_library( ${TARGET} STATIC ${SOURCES})
+
+find_package(wxWidgets REQUIRED COMPONENTS net core base)
+#include( ${wxWidgets_USE_FILE} )
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${wxWidgets_ROOT_DIR}/src/zlib
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libmad/CMakeLists.txt b/cmake-proxies/libmad/CMakeLists.txt
index a8653b2df..2ef1e188f 100644
--- a/cmake-proxies/libmad/CMakeLists.txt
+++ b/cmake-proxies/libmad/CMakeLists.txt
@@ -11,18 +11,29 @@ ${LIB_SRC_DIRECTORY}libmad/frame.c
 ${LIB_SRC_DIRECTORY}libmad/huffman.c
 ${LIB_SRC_DIRECTORY}libmad/layer12.c
 ${LIB_SRC_DIRECTORY}libmad/layer3.c
-${LIB_SRC_DIRECTORY}libmad/minimad.c
+#${LIB_SRC_DIRECTORY}libmad/minimad.c
 ${LIB_SRC_DIRECTORY}libmad/stream.c
 ${LIB_SRC_DIRECTORY}libmad/synth.c
 ${LIB_SRC_DIRECTORY}libmad/timer.c
 ${LIB_SRC_DIRECTORY}libmad/version.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D__WX__
+-DWIN32
+-D_WINDOWS
+-D__WINDOWS__
+-D__WXMSW__
+-D__WIN95__
+-D__WIN32__
+-D_LIB
+-DHAVE_CONFIG_H
+-DFPM_INTEL
+)
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/msvc++
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libnyquist/CMakeLists.txt b/cmake-proxies/libnyquist/CMakeLists.txt
index a7ff9e022..a83602347 100644
--- a/cmake-proxies/libnyquist/CMakeLists.txt
+++ b/cmake-proxies/libnyquist/CMakeLists.txt
@@ -48,8 +48,8 @@ ${LIB_SRC_DIRECTORY}libnyquist/nyquist/nyqstk/src/Sitar.cpp
 ${LIB_SRC_DIRECTORY}libnyquist/nyquist/nyqstk/src/Stk.cpp
 ${LIB_SRC_DIRECTORY}libnyquist/nyquist/nyqstk/src/WaveLoop.cpp
 ${LIB_SRC_DIRECTORY}libnyquist/nyquist/nyqstk/src/WvIn.cpp
-${LIB_SRC_DIRECTORY}libnyquist/nyquist/sys/win/wingui/longque.cpp
-${LIB_SRC_DIRECTORY}libnyquist/nyquist/sys/win/wingui/textio.cpp
+#${LIB_SRC_DIRECTORY}libnyquist/nyquist/sys/win/wingui/longque.cpp
+#${LIB_SRC_DIRECTORY}libnyquist/nyquist/sys/win/wingui/textio.cpp
 #${LIB_SRC_DIRECTORY}libnyquist/nyquist/sys/win/wingui/winmain.cpp
 
 ${LIB_SRC_DIRECTORY}libnyquist/nyx.c
@@ -75,7 +75,7 @@ ${LIB_SRC_DIRECTORY}libnyquist/nyquist/cmt/seqread.c
 ${LIB_SRC_DIRECTORY}libnyquist/nyquist/cmt/seqwrite.c
 ${LIB_SRC_DIRECTORY}libnyquist/nyquist/cmt/tempomap.c
 ${LIB_SRC_DIRECTORY}libnyquist/nyquist/cmt/timebase.c
-#${LIB_SRC_DIRECTORY}libnyquist/nyquist/cmt/userio.c #??using textio instead
+${LIB_SRC_DIRECTORY}libnyquist/nyquist/cmt/userio.c
 #${LIB_SRC_DIRECTORY}libnyquist/nyquist/ffts/Matlab-testing/conv2dTest.c
 #${LIB_SRC_DIRECTORY}libnyquist/nyquist/ffts/Matlab-testing/convTest.c
 #${LIB_SRC_DIRECTORY}libnyquist/nyquist/ffts/Matlab-testing/rfft2dTestML.c
diff --git a/cmake-proxies/libogg/CMakeLists.txt b/cmake-proxies/libogg/CMakeLists.txt
index 5459e1cdc..8720f0916 100644
--- a/cmake-proxies/libogg/CMakeLists.txt
+++ b/cmake-proxies/libogg/CMakeLists.txt
@@ -9,11 +9,13 @@ ${LIB_SRC_DIRECTORY}libogg/src/bitwise.c
 ${LIB_SRC_DIRECTORY}libogg/src/framing.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+)
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libscorealign/CMakeLists.txt b/cmake-proxies/libscorealign/CMakeLists.txt
index 5224cb753..74616fa24 100644
--- a/cmake-proxies/libscorealign/CMakeLists.txt
+++ b/cmake-proxies/libscorealign/CMakeLists.txt
@@ -4,28 +4,31 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}libscorealign/alignfiles.cpp
-${LIB_SRC_DIRECTORY}libscorealign/audiofilereader-snd.cpp
-${LIB_SRC_DIRECTORY}libscorealign/audiofilereader.cpp
+#${LIB_SRC_DIRECTORY}libscorealign/alignfiles.cpp
+#${LIB_SRC_DIRECTORY}libscorealign/audiofilereader-snd.cpp
+#${LIB_SRC_DIRECTORY}libscorealign/audiofilereader.cpp
+
 ${LIB_SRC_DIRECTORY}libscorealign/audioreader.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/comp_chroma.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/curvefit.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/gen_chroma.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/hillclimb.cpp
-${LIB_SRC_DIRECTORY}libscorealign/main.cpp
+#${LIB_SRC_DIRECTORY}libscorealign/main.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/regression.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/sautils.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/scorealign.cpp
-${LIB_SRC_DIRECTORY}libscorealign/trace.cpp
-${LIB_SRC_DIRECTORY}libscorealign/compare_transcripts/compare.cpp
+#${LIB_SRC_DIRECTORY}libscorealign/trace.cpp
+#${LIB_SRC_DIRECTORY}libscorealign/compare_transcripts/compare.cpp
 ${LIB_SRC_DIRECTORY}libscorealign/fft3/FFT3.cpp
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+)
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${LIB_SRC_DIRECTORY}/portsmf
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libsndfile/CMakeLists.txt b/cmake-proxies/libsndfile/CMakeLists.txt
index 79f86f5b5..d3096b52f 100644
--- a/cmake-proxies/libsndfile/CMakeLists.txt
+++ b/cmake-proxies/libsndfile/CMakeLists.txt
@@ -4,25 +4,25 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}libsndfile/examples/generate.c
-${LIB_SRC_DIRECTORY}libsndfile/examples/list_formats.c
-${LIB_SRC_DIRECTORY}libsndfile/examples/make_sine.c
-${LIB_SRC_DIRECTORY}libsndfile/examples/sfprocess.c
-${LIB_SRC_DIRECTORY}libsndfile/examples/sndfile-to-text.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/common.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-cmp.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-concat.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-convert.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-deinterleave.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-info.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-interleave.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-metadata-get.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-metadata-set.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-play.c
-${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-salvage.c
-${LIB_SRC_DIRECTORY}libsndfile/regtest/checksum.c
-${LIB_SRC_DIRECTORY}libsndfile/regtest/database.c
-${LIB_SRC_DIRECTORY}libsndfile/regtest/sndfile-regtest.c
+#${LIB_SRC_DIRECTORY}libsndfile/examples/generate.c
+#${LIB_SRC_DIRECTORY}libsndfile/examples/list_formats.c
+#${LIB_SRC_DIRECTORY}libsndfile/examples/make_sine.c
+#${LIB_SRC_DIRECTORY}libsndfile/examples/sfprocess.c
+#${LIB_SRC_DIRECTORY}libsndfile/examples/sndfile-to-text.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/common.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-cmp.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-concat.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-convert.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-deinterleave.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-info.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-interleave.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-metadata-get.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-metadata-set.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-play.c
+#${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-salvage.c
+#${LIB_SRC_DIRECTORY}libsndfile/regtest/checksum.c
+#${LIB_SRC_DIRECTORY}libsndfile/regtest/database.c
+#${LIB_SRC_DIRECTORY}libsndfile/regtest/sndfile-regtest.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/aiff.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/alaw.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/au.c
@@ -68,16 +68,16 @@ ${LIB_SRC_DIRECTORY}libsndfile/src/sds.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/sndfile.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/strings.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/svx.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_audio_detect.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_broadcast_var.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_conversions.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_endswap.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_file_io.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_float.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_ima_oki_adpcm.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_log_printf.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_main.c
-${LIB_SRC_DIRECTORY}libsndfile/src/test_strncpy_crlf.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_audio_detect.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_broadcast_var.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_conversions.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_endswap.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_file_io.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_float.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_ima_oki_adpcm.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_log_printf.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_main.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/test_strncpy_crlf.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/txw.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/ulaw.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/voc.c
@@ -93,7 +93,7 @@ ${LIB_SRC_DIRECTORY}libsndfile/src/G72x/g723_16.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/G72x/g723_24.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/G72x/g723_40.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/G72x/g72x.c
-${LIB_SRC_DIRECTORY}libsndfile/src/G72x/g72x_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/src/G72x/g72x_test.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/add.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/code.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/decode.c
@@ -108,55 +108,64 @@ ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/preprocess.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/rpe.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/short_term.c
 ${LIB_SRC_DIRECTORY}libsndfile/src/GSM610/table.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/aiff_rw_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/alaw_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/benchmark.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/checksum_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/command_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/dft_cmp.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/dither_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/dwvw_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/error_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/external_libs_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/fix_this.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/floating_point_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/generate.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/headerless_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/header_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/largefile_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/locale_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/lossy_comp_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/misc_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/multi_file_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/ogg_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/pcm_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/peak_chunk_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/pipe_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/raw_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/rdwr_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/scale_clip_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/sfversion.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/stdin_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/stdio_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/stdout_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/string_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/ulaw_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/utils.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/virtual_io_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/vorbis_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/win32_ordinal_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/win32_test.c
-${LIB_SRC_DIRECTORY}libsndfile/tests/write_read_test.c
-${LIB_SRC_DIRECTORY}libsndfile/Win32/testprog.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/aiff_rw_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/alaw_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/benchmark.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/checksum_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/command_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/dft_cmp.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/dither_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/dwvw_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/error_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/external_libs_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/fix_this.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/floating_point_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/generate.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/headerless_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/header_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/largefile_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/locale_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/lossy_comp_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/misc_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/multi_file_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/ogg_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/pcm_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/peak_chunk_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/pipe_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/raw_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/rdwr_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/scale_clip_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/sfversion.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/stdin_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/stdio_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/stdout_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/string_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/ulaw_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/utils.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/virtual_io_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/vorbis_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/win32_ordinal_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/win32_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/tests/write_read_test.c
+#${LIB_SRC_DIRECTORY}libsndfile/Win32/testprog.c
 #${LIB_SRC_DIRECTORY}libsndfile/programs/sndfile-play-beos.cpp
 
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+-Dinline=__inline
+-DLIBSNDFILE_PRIVATE_CONFIG
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
+
+add_compile_options(/wd4996)
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
+${TARGET_SOURCE}/src
+${LIB_SRC_DIRECTORY}/ffmpeg/win32
+${top_dir}/win/Projects/libsndfile #to get config.h
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libsoxr/CMakeLists.txt b/cmake-proxies/libsoxr/CMakeLists.txt
index 983aca02b..faf429229 100644
--- a/cmake-proxies/libsoxr/CMakeLists.txt
+++ b/cmake-proxies/libsoxr/CMakeLists.txt
@@ -4,50 +4,54 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}libsoxr/examples/1-single-block.c
-${LIB_SRC_DIRECTORY}libsoxr/examples/1a-lsr.c
-${LIB_SRC_DIRECTORY}libsoxr/examples/2-stream.C
-${LIB_SRC_DIRECTORY}libsoxr/examples/3-options-input-fn.c
-${LIB_SRC_DIRECTORY}libsoxr/examples/4-split-channels.c
-${LIB_SRC_DIRECTORY}libsoxr/examples/5-variable-rate.c
-${LIB_SRC_DIRECTORY}libsoxr/src/avfft32.c
-${LIB_SRC_DIRECTORY}libsoxr/src/avfft32s.c
-${LIB_SRC_DIRECTORY}libsoxr/src/cr-core.c
+#${LIB_SRC_DIRECTORY}libsoxr/examples/1-single-block.c
+#${LIB_SRC_DIRECTORY}libsoxr/examples/1a-lsr.c
+#${LIB_SRC_DIRECTORY}libsoxr/examples/2-stream.C
+#${LIB_SRC_DIRECTORY}libsoxr/examples/3-options-input-fn.c
+#${LIB_SRC_DIRECTORY}libsoxr/examples/4-split-channels.c
+#${LIB_SRC_DIRECTORY}libsoxr/examples/5-variable-rate.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/avfft32.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/avfft32s.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/cr-core.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/cr.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/cr32.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/cr32s.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/cr64.c
-${LIB_SRC_DIRECTORY}libsoxr/src/cr64s.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/cr64s.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/data-io.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/dbesi0.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/fft4g.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/fft4g32.c
-${LIB_SRC_DIRECTORY}libsoxr/src/fft4g32s.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/fft4g32s.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/fft4g64.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/filter.c
-${LIB_SRC_DIRECTORY}libsoxr/src/pffft-wrap.c
-${LIB_SRC_DIRECTORY}libsoxr/src/pffft.c
-${LIB_SRC_DIRECTORY}libsoxr/src/pffft32.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/pffft-wrap.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/pffft.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/pffft32.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/pffft32s.c
-${LIB_SRC_DIRECTORY}libsoxr/src/pffft64s.c
-${LIB_SRC_DIRECTORY}libsoxr/src/soxr-lsr.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/pffft64s.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/soxr-lsr.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/soxr.c
-${LIB_SRC_DIRECTORY}libsoxr/src/util-simd.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/util-simd.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/util32s.c
-${LIB_SRC_DIRECTORY}libsoxr/src/util64s.c
-${LIB_SRC_DIRECTORY}libsoxr/src/vr-coefs.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/util64s.c
+#${LIB_SRC_DIRECTORY}libsoxr/src/vr-coefs.c
 ${LIB_SRC_DIRECTORY}libsoxr/src/vr32.c
-${LIB_SRC_DIRECTORY}libsoxr/tests/1-delay-clear.c
-${LIB_SRC_DIRECTORY}libsoxr/tests/throughput.c
-${LIB_SRC_DIRECTORY}libsoxr/tests/vector-cmp.c
-${LIB_SRC_DIRECTORY}libsoxr/tests/vector-gen.c
+#${LIB_SRC_DIRECTORY}libsoxr/tests/1-delay-clear.c
+#${LIB_SRC_DIRECTORY}libsoxr/tests/throughput.c
+#${LIB_SRC_DIRECTORY}libsoxr/tests/vector-cmp.c
+#${LIB_SRC_DIRECTORY}libsoxr/tests/vector-gen.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_USE_MATH_DEFINES
+-D_CRT_SECURE_NO_WARNINGS
+-DSOXR_LIB
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/msvc
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libvamp/CMakeLists.txt b/cmake-proxies/libvamp/CMakeLists.txt
index 4ece2bea0..8070e920e 100644
--- a/cmake-proxies/libvamp/CMakeLists.txt
+++ b/cmake-proxies/libvamp/CMakeLists.txt
@@ -5,17 +5,17 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}libvamp/examples/AmplitudeFollower.cpp
-${LIB_SRC_DIRECTORY}libvamp/examples/FixedTempoEstimator.cpp
-${LIB_SRC_DIRECTORY}libvamp/examples/PercussionOnsetDetector.cpp
-${LIB_SRC_DIRECTORY}libvamp/examples/plugins.cpp
-${LIB_SRC_DIRECTORY}libvamp/examples/PowerSpectrum.cpp
-${LIB_SRC_DIRECTORY}libvamp/examples/SpectralCentroid.cpp
-${LIB_SRC_DIRECTORY}libvamp/examples/ZeroCrossing.cpp
-${LIB_SRC_DIRECTORY}libvamp/host/vamp-simple-host.cpp
-${LIB_SRC_DIRECTORY}libvamp/rdf/generator/vamp-rdf-template-generator.cpp
-${LIB_SRC_DIRECTORY}libvamp/skeleton/MyPlugin.cpp
-${LIB_SRC_DIRECTORY}libvamp/skeleton/plugins.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/AmplitudeFollower.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/FixedTempoEstimator.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/PercussionOnsetDetector.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/plugins.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/PowerSpectrum.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/SpectralCentroid.cpp
+#${LIB_SRC_DIRECTORY}libvamp/examples/ZeroCrossing.cpp
+#${LIB_SRC_DIRECTORY}libvamp/host/vamp-simple-host.cpp
+#${LIB_SRC_DIRECTORY}libvamp/rdf/generator/vamp-rdf-template-generator.cpp
+#${LIB_SRC_DIRECTORY}libvamp/skeleton/MyPlugin.cpp
+#${LIB_SRC_DIRECTORY}libvamp/skeleton/plugins.cpp
 ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp
 ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/PluginChannelAdapter.cpp
 ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp
@@ -24,21 +24,24 @@ ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/PluginLoader.cpp
 ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp
 ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/PluginWrapper.cpp
 ${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/RealTime.cpp
-${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/FFT.cpp
-${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/FFTimpl.cpp
-${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/PluginAdapter.cpp
-${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/RealTime.cpp
+#${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/FFT.cpp
+#${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/FFTimpl.cpp
+#${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/PluginAdapter.cpp
+#${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/RealTime.cpp
 
 #${LIB_SRC_DIRECTORY}libvamp/src/vamp-hostsdk/acsymbols.c
 #${LIB_SRC_DIRECTORY}libvamp/src/vamp-sdk/acsymbols.c
 
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+-D_USE_MATH_DEFINES
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/libvorbis/CMakeLists.txt b/cmake-proxies/libvorbis/CMakeLists.txt
index 6054f0c8e..5855534e4 100644
--- a/cmake-proxies/libvorbis/CMakeLists.txt
+++ b/cmake-proxies/libvorbis/CMakeLists.txt
@@ -4,13 +4,13 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}libvorbis/examples/chaining_example.c
-${LIB_SRC_DIRECTORY}libvorbis/examples/decoder_example.c
-${LIB_SRC_DIRECTORY}libvorbis/examples/encoder_example.c
-${LIB_SRC_DIRECTORY}libvorbis/examples/seeking_example.c
-${LIB_SRC_DIRECTORY}libvorbis/examples/vorbisfile_example.c
+#${LIB_SRC_DIRECTORY}libvorbis/examples/chaining_example.c
+#${LIB_SRC_DIRECTORY}libvorbis/examples/decoder_example.c
+#${LIB_SRC_DIRECTORY}libvorbis/examples/encoder_example.c
+#${LIB_SRC_DIRECTORY}libvorbis/examples/seeking_example.c
+#${LIB_SRC_DIRECTORY}libvorbis/examples/vorbisfile_example.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/analysis.c
-${LIB_SRC_DIRECTORY}libvorbis/lib/barkmel.c
+#${LIB_SRC_DIRECTORY}libvorbis/lib/barkmel.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/bitrate.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/block.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/codebook.c
@@ -24,45 +24,48 @@ ${LIB_SRC_DIRECTORY}libvorbis/lib/lsp.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/mapping0.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/mdct.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/psy.c
-${LIB_SRC_DIRECTORY}libvorbis/lib/psytune.c
+#${LIB_SRC_DIRECTORY}libvorbis/lib/psytune.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/registry.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/res0.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/sharedbook.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/smallft.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/synthesis.c
-${LIB_SRC_DIRECTORY}libvorbis/lib/tone.c
+#${LIB_SRC_DIRECTORY}libvorbis/lib/tone.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/vorbisenc.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/vorbisfile.c
 ${LIB_SRC_DIRECTORY}libvorbis/lib/window.c
-${LIB_SRC_DIRECTORY}libvorbis/macos/compat/strdup.c
-${LIB_SRC_DIRECTORY}libvorbis/test/test.c
-${LIB_SRC_DIRECTORY}libvorbis/test/util.c
-${LIB_SRC_DIRECTORY}libvorbis/test/write_read.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/bookutil.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/build.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/cascade.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/distribution.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/genericdata.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/huffbuild.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/latticebuild.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/latticehint.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/latticepare.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/latticetune.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/lspdata.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/metrics.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/residuedata.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/residuesplit.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/run.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/train.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/vqgen.c
-${LIB_SRC_DIRECTORY}libvorbis/vq/vqsplit.c
+#${LIB_SRC_DIRECTORY}libvorbis/macos/compat/strdup.c
+#${LIB_SRC_DIRECTORY}libvorbis/test/test.c
+#${LIB_SRC_DIRECTORY}libvorbis/test/util.c
+#${LIB_SRC_DIRECTORY}libvorbis/test/write_read.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/bookutil.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/build.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/cascade.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/distribution.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/genericdata.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/huffbuild.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/latticebuild.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/latticehint.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/latticepare.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/latticetune.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/lspdata.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/metrics.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/residuedata.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/residuesplit.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/run.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/train.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/vqgen.c
+#${LIB_SRC_DIRECTORY}libvorbis/vq/vqsplit.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
+${LIB_SRC_DIRECTORY}/libogg/include
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/lv2/CMakeLists.txt b/cmake-proxies/lv2/CMakeLists.txt
index 22d9f3eb4..0f01ba64b 100644
--- a/cmake-proxies/lv2/CMakeLists.txt
+++ b/cmake-proxies/lv2/CMakeLists.txt
@@ -4,13 +4,13 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}lv2/sord/src/sordmm_test.cpp
+#${LIB_SRC_DIRECTORY}lv2/sord/src/sordmm_test.cpp
 #${LIB_SRC_DIRECTORY}lv2/suil/src/gtk2_in_qt4.cpp
 #${LIB_SRC_DIRECTORY}lv2/suil/src/qt4_in_gtk2.cpp
-${LIB_SRC_DIRECTORY}lv2/suil/src/win_in_gtk2.cpp
+#${LIB_SRC_DIRECTORY}lv2/suil/src/win_in_gtk2.cpp
 #${LIB_SRC_DIRECTORY}lv2/suil/src/x11_in_qt4.cpp
 
-${LIB_SRC_DIRECTORY}lv2/lilv/bindings/test/bindings_test_plugin.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/bindings/test/bindings_test_plugin.c
 ${LIB_SRC_DIRECTORY}lv2/lilv/src/collections.c
 ${LIB_SRC_DIRECTORY}lv2/lilv/src/instance.c
 ${LIB_SRC_DIRECTORY}lv2/lilv/src/lib.c
@@ -24,53 +24,68 @@ ${LIB_SRC_DIRECTORY}lv2/lilv/src/state.c
 ${LIB_SRC_DIRECTORY}lv2/lilv/src/ui.c
 ${LIB_SRC_DIRECTORY}lv2/lilv/src/util.c
 ${LIB_SRC_DIRECTORY}lv2/lilv/src/world.c
-${LIB_SRC_DIRECTORY}lv2/lilv/src/zix/tree.c
-${LIB_SRC_DIRECTORY}lv2/lilv/test/lilv_test.c
-${LIB_SRC_DIRECTORY}lv2/lilv/test/test_plugin.c
-${LIB_SRC_DIRECTORY}lv2/lilv/utils/lilv-bench.c
-${LIB_SRC_DIRECTORY}lv2/lilv/utils/lv2bench.c
-${LIB_SRC_DIRECTORY}lv2/lilv/utils/lv2info.c
-${LIB_SRC_DIRECTORY}lv2/lilv/utils/lv2ls.c
-${LIB_SRC_DIRECTORY}lv2/lv2/lv2/lv2plug.in/ns/ext/atom/atom-test.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-amp.lv2/amp.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-fifths.lv2/fifths.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-metro.lv2/metro.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-midigate.lv2/midigate.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-sampler.lv2/sampler.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-sampler.lv2/sampler_ui.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-scope.lv2/examploscope.c
-${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-scope.lv2/examploscope_ui.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/src/zix/tree.c #see sord source.
+
+#${LIB_SRC_DIRECTORY}lv2/lilv/test/lilv_test.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/test/test_plugin.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/utils/lilv-bench.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/utils/lv2bench.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/utils/lv2info.c
+#${LIB_SRC_DIRECTORY}lv2/lilv/utils/lv2ls.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/lv2/lv2plug.in/ns/ext/atom/atom-test.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-amp.lv2/amp.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-fifths.lv2/fifths.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-metro.lv2/metro.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-midigate.lv2/midigate.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-sampler.lv2/sampler.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-sampler.lv2/sampler_ui.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-scope.lv2/examploscope.c
+#${LIB_SRC_DIRECTORY}lv2/lv2/plugins/eg-scope.lv2/examploscope_ui.c
 ${LIB_SRC_DIRECTORY}lv2/serd/src/env.c
-${LIB_SRC_DIRECTORY}lv2/serd/src/node.c
+#${LIB_SRC_DIRECTORY}lv2/serd/src/node.c
 ${LIB_SRC_DIRECTORY}lv2/serd/src/reader.c
-${LIB_SRC_DIRECTORY}lv2/serd/src/serdi.c
+#${LIB_SRC_DIRECTORY}lv2/serd/src/serdi.c
 ${LIB_SRC_DIRECTORY}lv2/serd/src/serdnode.c
 ${LIB_SRC_DIRECTORY}lv2/serd/src/string.c
 ${LIB_SRC_DIRECTORY}lv2/serd/src/uri.c
 ${LIB_SRC_DIRECTORY}lv2/serd/src/writer.c
-${LIB_SRC_DIRECTORY}lv2/serd/tests/serd_test.c
+#${LIB_SRC_DIRECTORY}lv2/serd/tests/serd_test.c
 ${LIB_SRC_DIRECTORY}lv2/sord/src/sord.c
-${LIB_SRC_DIRECTORY}lv2/sord/src/sordi.c
-${LIB_SRC_DIRECTORY}lv2/sord/src/sord_test.c
-${LIB_SRC_DIRECTORY}lv2/sord/src/sord_validate.c
+#${LIB_SRC_DIRECTORY}lv2/sord/src/sordi.c
+#${LIB_SRC_DIRECTORY}lv2/sord/src/sord_test.c
+#${LIB_SRC_DIRECTORY}lv2/sord/src/sord_validate.c
 ${LIB_SRC_DIRECTORY}lv2/sord/src/syntax.c
 ${LIB_SRC_DIRECTORY}lv2/sord/src/zix/digest.c
 ${LIB_SRC_DIRECTORY}lv2/sord/src/zix/hash.c
 ${LIB_SRC_DIRECTORY}lv2/sord/src/zix/tree.c
 ${LIB_SRC_DIRECTORY}lv2/sratom/src/sratom.c
-${LIB_SRC_DIRECTORY}lv2/sratom/tests/sratom_test.c
+#${LIB_SRC_DIRECTORY}lv2/sratom/tests/sratom_test.c
 ${LIB_SRC_DIRECTORY}lv2/suil/src/host.c
-${LIB_SRC_DIRECTORY}lv2/suil/src/instance.c
+#${LIB_SRC_DIRECTORY}lv2/suil/src/instance.c
 ${LIB_SRC_DIRECTORY}lv2/suil/src/suil_instance.c
 #${LIB_SRC_DIRECTORY}lv2/suil/src/x11_in_gtk2.c
 
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
-
+add_definitions( 
+-D_LIB
+-Dsnprintf=_snprintf
+-Dinline=__inline # Not needed in non CMake version.
+-DHAVE_FMAX
+-DLILV_INTERNAL
+-D_DEBUG
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
+add_compile_options(/TP)
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/windows
+${TARGET_SOURCE}/sord/src
+${TARGET_SOURCE}/lilv
+${TARGET_SOURCE}/lv2
+${TARGET_SOURCE}/serd
+${TARGET_SOURCE}/sord
+${TARGET_SOURCE}/sratom
+${TARGET_SOURCE}/suil
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/portaudio-v19/CMakeLists.txt b/cmake-proxies/portaudio-v19/CMakeLists.txt
index e052931c7..8bb45b4dc 100644
--- a/cmake-proxies/portaudio-v19/CMakeLists.txt
+++ b/cmake-proxies/portaudio-v19/CMakeLists.txt
@@ -4,37 +4,37 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}portaudio-v19/bindings/java/c/src/com_portaudio_BlockingStream.c
-${LIB_SRC_DIRECTORY}portaudio-v19/bindings/java/c/src/com_portaudio_PortAudio.c
-${LIB_SRC_DIRECTORY}portaudio-v19/bindings/java/c/src/jpa_tools.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_mono_asio_channel_select.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_ocean_shore.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_pink.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_read_write_wire.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_record.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_record_file.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_saw.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_sine.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_wmme_ac3.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_wmme_surround.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_write_sine.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_write_sine_nonint.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/pa_devs.c
-${LIB_SRC_DIRECTORY}portaudio-v19/examples/pa_fuzz.c
-${LIB_SRC_DIRECTORY}portaudio-v19/pablio/pablio.c
-${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_rw.c
-${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_rw_echo.c
-${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_w_saw.c
-${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_w_saw8.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/paqa_devs.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/paqa_errs.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/paqa_latency.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/audio_analyzer.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/biquad_filter.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/paqa.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/paqa_tools.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/test_audio_analyzer.c
-${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/write_wav.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/bindings/java/c/src/com_portaudio_BlockingStream.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/bindings/java/c/src/com_portaudio_PortAudio.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/bindings/java/c/src/jpa_tools.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_mono_asio_channel_select.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_ocean_shore.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_pink.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_read_write_wire.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_record.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_record_file.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_saw.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_sine.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_wmme_ac3.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_wmme_surround.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_write_sine.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_write_sine_nonint.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/pa_devs.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/examples/pa_fuzz.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/pablio/pablio.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_rw.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_rw_echo.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_w_saw.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/pablio/test_w_saw8.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/paqa_devs.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/paqa_errs.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/paqa_latency.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/audio_analyzer.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/biquad_filter.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/paqa.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/paqa_tools.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/test_audio_analyzer.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/qa/loopback/src/write_wav.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_allocation.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_converters.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_cpuload.c
@@ -46,84 +46,97 @@ ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_process.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_ringbuffer.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_stream.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/common/pa_trace.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/asihpi/pa_linux_asihpi.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core_utilities.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/asihpi/pa_linux_asihpi.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/coreaudio/pa_mac_core_utilities.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/dsound/pa_win_ds.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/dsound/pa_win_ds_dynlink.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/jack/pa_jack.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/jack/pa_jack_dynload.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/oss/pa_unix_oss.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/oss/recplay.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/skeleton/pa_hostapi_skeleton.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/jack/pa_jack.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/jack/pa_jack_dynload.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/oss/pa_unix_oss.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/oss/recplay.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/skeleton/pa_hostapi_skeleton.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/wmme/pa_win_wmme.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/os/unix/pa_unix_hostapis.c
-${LIB_SRC_DIRECTORY}portaudio-v19/src/os/unix/pa_unix_util.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/os/unix/pa_unix_hostapis.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/src/os/unix/pa_unix_util.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/os/win/pa_win_coinitialize.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/os/win/pa_win_hostapis.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/os/win/pa_win_util.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/os/win/pa_win_waveformat.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/os/win/pa_win_wdmks_utils.c
 ${LIB_SRC_DIRECTORY}portaudio-v19/src/os/win/pa_x86_plain_converters.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest1.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_buffer.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_callbackstop.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_clip.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_converters.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dither.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dsound_find_best_latency_params.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dsound_low_level_latency_params.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dsound_surround.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_hang.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_in_overflow.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_jack_wasapi.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_latency.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_leftright.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_longsine.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_many.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_maxsines.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_mono.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_multi_sine.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_out_underflow.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_prime.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_read_record.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_ringmix.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine8.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_channelmaps.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_formats.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_srate.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_time.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_start_stop.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_stop.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_stop_playout.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_suggested_vs_streaminfo_latency.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sync.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_timing.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_toomanysines.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_two_rates.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_underflow.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_wire.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_wmme_find_best_latency_params.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_wmme_low_level_latency_params.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_write_stop.c
-${LIB_SRC_DIRECTORY}portaudio-v19/test/pa_minlat.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest1.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_buffer.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_callbackstop.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_clip.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_converters.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dither.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dsound_find_best_latency_params.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dsound_low_level_latency_params.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_dsound_surround.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_hang.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_in_overflow.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_jack_wasapi.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_latency.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_leftright.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_longsine.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_many.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_maxsines.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_mono.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_multi_sine.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_out_underflow.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_prime.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_read_record.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_ringmix.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine8.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_channelmaps.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_formats.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_srate.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sine_time.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_start_stop.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_stop.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_stop_playout.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_suggested_vs_streaminfo_latency.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_sync.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_timing.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_toomanysines.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_two_rates.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_underflow.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_wire.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_wmme_find_best_latency_params.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_wmme_low_level_latency_params.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/patest_write_stop.c
+#${LIB_SRC_DIRECTORY}portaudio-v19/test/pa_minlat.c
 
-#${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_sine_c++.cpp
+##${LIB_SRC_DIRECTORY}portaudio-v19/examples/paex_sine_c++.cpp
 #${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/asio/iasiothiscallresolver.cpp
 #${LIB_SRC_DIRECTORY}portaudio-v19/src/hostapi/asio/pa_asio.cpp
 
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
+
+#if(MSVC)
+#FIX-ME What a horrible hacky place for a config file!
+    add_definitions(/FI"${top_dir}/win/Projects/${TARGET}/Debug/config.h")
+#else()
+    # GCC or Clang
+#    add_definitions(-include ${top_dir}/win/Projects/${TARGET}/config.h)
+#endif()
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
+${TARGET_SOURCE}/src/common
+${TARGET_SOURCE}/src/os/win
+${TARGET_SOURCE}
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/portmidi/CMakeLists.txt b/cmake-proxies/portmidi/CMakeLists.txt
index 58a9eaeee..15889b103 100644
--- a/cmake-proxies/portmidi/CMakeLists.txt
+++ b/cmake-proxies/portmidi/CMakeLists.txt
@@ -4,44 +4,48 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}portmidi/pm_csharp/pm_managed/AssemblyInfo.cpp
-${LIB_SRC_DIRECTORY}portmidi/pm_csharp/pm_managed/pm_managed.cpp
-${LIB_SRC_DIRECTORY}portmidi/pm_csharp/pm_managed/Stdafx.cpp
+#${LIB_SRC_DIRECTORY}portmidi/pm_csharp/pm_managed/AssemblyInfo.cpp
+#${LIB_SRC_DIRECTORY}portmidi/pm_csharp/pm_managed/pm_managed.cpp
+#${LIB_SRC_DIRECTORY}portmidi/pm_csharp/pm_managed/Stdafx.cpp
 
 ${LIB_SRC_DIRECTORY}portmidi/pm_common/pmutil.c
 ${LIB_SRC_DIRECTORY}portmidi/pm_common/portmidi.c
-${LIB_SRC_DIRECTORY}portmidi/pm_java/pmjni/pmjni.c
-${LIB_SRC_DIRECTORY}portmidi/pm_linux/finddefault.c
-${LIB_SRC_DIRECTORY}portmidi/pm_linux/pmlinux.c
-${LIB_SRC_DIRECTORY}portmidi/pm_linux/pmlinuxalsa.c
-${LIB_SRC_DIRECTORY}portmidi/pm_mac/finddefault.c
-${LIB_SRC_DIRECTORY}portmidi/pm_mac/pmmac.c
-${LIB_SRC_DIRECTORY}portmidi/pm_mac/pmmacosxcm.c
-${LIB_SRC_DIRECTORY}portmidi/pm_mac/readbinaryplist.c
-${LIB_SRC_DIRECTORY}portmidi/pm_python/pyportmidi/_pyportmidi.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/latency.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/midiclock.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/midithread.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/midithru.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/mm.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/qtest.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/sysex.c
-${LIB_SRC_DIRECTORY}portmidi/pm_test/test.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_java/pmjni/pmjni.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_linux/finddefault.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_linux/pmlinux.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_linux/pmlinuxalsa.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_mac/finddefault.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_mac/pmmac.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_mac/pmmacosxcm.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_mac/readbinaryplist.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_python/pyportmidi/_pyportmidi.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/latency.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/midiclock.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/midithread.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/midithru.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/mm.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/qtest.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/sysex.c
+#${LIB_SRC_DIRECTORY}portmidi/pm_test/test.c
 ${LIB_SRC_DIRECTORY}portmidi/pm_win/pmwin.c
 ${LIB_SRC_DIRECTORY}portmidi/pm_win/pmwinmm.c
 ${LIB_SRC_DIRECTORY}portmidi/porttime/porttime.c
-${LIB_SRC_DIRECTORY}portmidi/porttime/ptlinux.c
-${LIB_SRC_DIRECTORY}portmidi/porttime/ptmacosx_cf.c
-${LIB_SRC_DIRECTORY}portmidi/porttime/ptmacosx_mach.c
+#${LIB_SRC_DIRECTORY}portmidi/porttime/ptlinux.c
+#${LIB_SRC_DIRECTORY}portmidi/porttime/ptmacosx_cf.c
+#${LIB_SRC_DIRECTORY}portmidi/porttime/ptmacosx_mach.c
 ${LIB_SRC_DIRECTORY}portmidi/porttime/ptwinmm.c
 
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-DLIB
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/pm_common
+${TARGET_SOURCE}/pm_win
+${TARGET_SOURCE}/porttime
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/portmixer/CMakeLists.txt b/cmake-proxies/portmixer/CMakeLists.txt
index 4ff87963f..c0137c6fd 100644
--- a/cmake-proxies/portmixer/CMakeLists.txt
+++ b/cmake-proxies/portmixer/CMakeLists.txt
@@ -4,12 +4,12 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}portmixer/px_tests/px_test.c
-${LIB_SRC_DIRECTORY}portmixer/src/px_example_api.c
-${LIB_SRC_DIRECTORY}portmixer/src/px_linux_alsa.c
-${LIB_SRC_DIRECTORY}portmixer/src/px_mac_coreaudio.c
+#${LIB_SRC_DIRECTORY}portmixer/px_tests/px_test.c
+#${LIB_SRC_DIRECTORY}portmixer/src/px_example_api.c
+#${LIB_SRC_DIRECTORY}portmixer/src/px_linux_alsa.c
+#${LIB_SRC_DIRECTORY}portmixer/src/px_mac_coreaudio.c
 ${LIB_SRC_DIRECTORY}portmixer/src/px_mixer.c
-${LIB_SRC_DIRECTORY}portmixer/src/px_unix_oss.c
+#${LIB_SRC_DIRECTORY}portmixer/src/px_unix_oss.c
 ${LIB_SRC_DIRECTORY}portmixer/src/px_win_common.c
 ${LIB_SRC_DIRECTORY}portmixer/src/px_win_ds.c
 ${LIB_SRC_DIRECTORY}portmixer/src/px_win_endpoint.c
@@ -17,11 +17,23 @@ ${LIB_SRC_DIRECTORY}portmixer/src/px_win_wasapi.c
 ${LIB_SRC_DIRECTORY}portmixer/src/px_win_wmme.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
+add_definitions( 
+-D_LIB
+ )
 add_library( ${TARGET} STATIC ${SOURCES})
 
-target_include_directories( ${TARGET} PRIVATE 
+#if(MSVC)
+#FIX-ME What a horrible hacky place for a config file!
+    add_definitions(/FI"${top_dir}/win/Projects/${TARGET}/Debug/config.h")
+#else()
+    # GCC or Clang
+#    add_definitions(-include ${top_dir}/win/Projects/${TARGET}/config.h)
+#endif()
 
+
+target_include_directories( ${TARGET} PRIVATE 
+${TARGET_SOURCE}/include
+${LIB_SRC_DIRECTORY}/portaudio-v19/include
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/portsmf/CMakeLists.txt b/cmake-proxies/portsmf/CMakeLists.txt
index 87cd0b51c..874d95b7a 100644
--- a/cmake-proxies/portsmf/CMakeLists.txt
+++ b/cmake-proxies/portsmf/CMakeLists.txt
@@ -12,15 +12,17 @@ ${LIB_SRC_DIRECTORY}portsmf/allegrosmfwr.cpp
 ${LIB_SRC_DIRECTORY}portsmf/allegrowr.cpp
 ${LIB_SRC_DIRECTORY}portsmf/mfmidi.cpp
 ${LIB_SRC_DIRECTORY}portsmf/strparse.cpp
-${LIB_SRC_DIRECTORY}portsmf/trace.cpp
-${LIB_SRC_DIRECTORY}portsmf/apps/allegroconvert.cpp
-${LIB_SRC_DIRECTORY}portsmf/apps/allegroplay.cpp
-${LIB_SRC_DIRECTORY}portsmf/apps/seq2midi.cpp
-${LIB_SRC_DIRECTORY}portsmf/portsmf_test/portsmf_test.cpp
+#${LIB_SRC_DIRECTORY}portsmf/trace.cpp
+#${LIB_SRC_DIRECTORY}portsmf/apps/allegroconvert.cpp
+#${LIB_SRC_DIRECTORY}portsmf/apps/allegroplay.cpp
+#${LIB_SRC_DIRECTORY}portsmf/apps/seq2midi.cpp
+#${LIB_SRC_DIRECTORY}portsmf/portsmf_test/portsmf_test.cpp
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
 
diff --git a/cmake-proxies/sbsms/CMakeLists.txt b/cmake-proxies/sbsms/CMakeLists.txt
index 6858297d4..effaf2cf7 100644
--- a/cmake-proxies/sbsms/CMakeLists.txt
+++ b/cmake-proxies/sbsms/CMakeLists.txt
@@ -17,11 +17,15 @@ ${LIB_SRC_DIRECTORY}sbsms/src/track.cpp
 ${LIB_SRC_DIRECTORY}sbsms/src/trackpoint.cpp
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+-DNDEBUG
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
+${TARGET_SOURCE}/win
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/soundtouch/CMakeLists.txt b/cmake-proxies/soundtouch/CMakeLists.txt
index e064afa55..c0c489a7c 100644
--- a/cmake-proxies/soundtouch/CMakeLists.txt
+++ b/cmake-proxies/soundtouch/CMakeLists.txt
@@ -5,29 +5,31 @@ project( ${TARGET} )
 
 set( SOURCES 
 
-${LIB_SRC_DIRECTORY}soundtouch/source/Android-lib/jni/soundtouch-jni.cpp
-${LIB_SRC_DIRECTORY}soundtouch/source/SoundStretch/main.cpp
-${LIB_SRC_DIRECTORY}soundtouch/source/SoundStretch/RunParameters.cpp
-${LIB_SRC_DIRECTORY}soundtouch/source/SoundStretch/WavFile.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/Android-lib/jni/soundtouch-jni.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/SoundStretch/main.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/SoundStretch/RunParameters.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/SoundStretch/WavFile.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/AAFilter.cpp
-${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/BPMDetect.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/BPMDetect.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/cpu_detect_x86.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/FIRFilter.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/mmx_optimized.cpp
-${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/PeakFinder.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/PeakFinder.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/RateTransposer.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/SoundTouch.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/sse_optimized.cpp
 ${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouch/TDStretch.cpp
-${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp
+#${LIB_SRC_DIRECTORY}soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
-
+${TARGET_SOURCE}/include
 )
 
 target_link_libraries( ${TARGET} )
\ No newline at end of file
diff --git a/cmake-proxies/twolame/CMakeLists.txt b/cmake-proxies/twolame/CMakeLists.txt
index d1465e1af..843e834d9 100644
--- a/cmake-proxies/twolame/CMakeLists.txt
+++ b/cmake-proxies/twolame/CMakeLists.txt
@@ -5,9 +5,9 @@ set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} )
 project( ${TARGET} )
 
 set( SOURCES 
-${LIB_SRC_DIRECTORY}twolame/frontend/audioin_raw.c
-${LIB_SRC_DIRECTORY}twolame/frontend/audioin_sndfile.c
-${LIB_SRC_DIRECTORY}twolame/frontend/frontend.c
+#${LIB_SRC_DIRECTORY}twolame/frontend/audioin_raw.c
+#${LIB_SRC_DIRECTORY}twolame/frontend/audioin_sndfile.c
+#${LIB_SRC_DIRECTORY}twolame/frontend/frontend.c
 ${LIB_SRC_DIRECTORY}twolame/libtwolame/ath.c
 ${LIB_SRC_DIRECTORY}twolame/libtwolame/availbits.c
 ${LIB_SRC_DIRECTORY}twolame/libtwolame/bitbuffer.c
@@ -27,12 +27,15 @@ ${LIB_SRC_DIRECTORY}twolame/libtwolame/psycho_n1.c
 ${LIB_SRC_DIRECTORY}twolame/libtwolame/subband.c
 ${LIB_SRC_DIRECTORY}twolame/libtwolame/twolame.c
 ${LIB_SRC_DIRECTORY}twolame/libtwolame/util.c
-${LIB_SRC_DIRECTORY}twolame/simplefrontend/audio_wave.c
-${LIB_SRC_DIRECTORY}twolame/simplefrontend/simplefrontend.c
+#${LIB_SRC_DIRECTORY}twolame/simplefrontend/audio_wave.c
+#${LIB_SRC_DIRECTORY}twolame/simplefrontend/simplefrontend.c
 )
 # This defines the #define on both Windows and Linux.
-add_definitions(  )
-add_library( ${TARGET} MODULE ${SOURCES})
+add_definitions( 
+-D_LIB
+-DLIBTWOLAME_STATIC
+ )
+add_library( ${TARGET} STATIC ${SOURCES})
 
 target_include_directories( ${TARGET} PRIVATE 
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2bd0c445e..8683fae7c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 #directory src
 project (Audacity)
-find_package(wxWidgets REQUIRED COMPONENTS net core base)
+find_package(wxWidgets REQUIRED COMPONENTS net core base html qa adv)
 include(${wxWidgets_USE_FILE})
 
 set_property(GLOBAL PROPERTY USE_FOLDERS On) 
@@ -29,6 +29,7 @@ include_directories(${top_dir}/win/Projects/libsndfile)
 include_directories(${top_dir}/lib-src/libsoxr/src) #really?  Src?
 include_directories(${top_dir}/lib-src/libvamp)
 include_directories(${top_dir}/lib-src/libvorbis/include)
+include_directories(${top_dir}/lib-src/lib-widget-extra)
 include_directories(${top_dir}/lib-src/portaudio-v19/include)
 include_directories(${top_dir}/lib-src/portmixer/include)
 include_directories(${top_dir}/lib-src/portsmf)
@@ -172,6 +173,8 @@ set( SOURCE
    ${CMAKE_SOURCE_DIRECTORY}WaveClip.cpp
    ${CMAKE_SOURCE_DIRECTORY}WaveTrack.cpp
    ${CMAKE_SOURCE_DIRECTORY}WrappedType.cpp
+   #An anomoly - a source file plucked from a lib.
+   ${top_dir}/lib-src/lib-widget-extra/NonGuiThread.cpp
 )
 
 # We're not yet adding each subdirectory.
@@ -488,7 +491,22 @@ set( SOURCE
 
 add_executable( Audacity ${SOURCE} )
 
-target_link_libraries(Audacity ${wxWidgets_LIBRARIES})
+message( STATUS "link directory is: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Debug" )
+message( STATUS "wxWidgets libraries in: ${wxWidgets_LIBRARIES}" )
+
+target_link_libraries(Audacity 
+${wxWidgets_LIBRARIES}
+expat.lib
+FileDialog.lib
+libsndfile.lib
+libsoxr.lib
+portaudio-v19.lib
+)
+if(MSVC)
+    set_property(TARGET Audacity APPEND PROPERTY LINK_FLAGS "/SUBSYSTEM:WINDOWS /LIBPATH:${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Debug")
+    #set_property(TARGET Audacity APPEND PROPERTY LINK_FLAGS )
+endif()
+
 #Use cotire to get precompiled headers, and a unity build.
 set_target_properties(Audacity 
 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT