Rename portaudio dll

Author: starg2

portaudio/CMakeLists.txt

@@ -86,14 +86,6 @@ add_library(
     portaudio.def
 )
 
-set_target_properties(portaudio PROPERTIES PREFIX "")
-
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-    set_target_properties(portaudio PROPERTIES OUTPUT_NAME "portaudio_x64")
-else()
-    set_target_properties(portaudio PROPERTIES OUTPUT_NAME "portaudio_x86")
-endif()
-
 target_link_libraries(portaudio ole32 advapi32 setupapi winmm)
 
 install(TARGETS portaudio)

timidity/w32_portaudio_dll.c

@@ -133,12 +133,8 @@ void free_portaudio_dll(void)
 int load_portaudio_dll(int a)
 {
 	if(!h_portaudio_dll){		
-#ifdef _WIN64
-		h_portaudio_dll = LoadLibrary("portaudio_x64");
-#else
-		h_portaudio_dll = LoadLibrary("portaudio_x86");
-#endif
-		if(!h_portaudio_dll) h_portaudio_dll = LoadLibrary("portaudio");
+		h_portaudio_dll = LoadLibrary("portaudio.dll");
+		if(!h_portaudio_dll) h_portaudio_dll = LoadLibrary("libportaudio.dll");
 		if(!h_portaudio_dll) return -1;
 	}
 	portaudio_dll.Pa_GetVersion = (type_Pa_GetVersion)GetProcAddress(h_portaudio_dll,"Pa_GetVersion");