From ae8fec4cb4d8d6f25a7f1da009af96b4c6c37634 Mon Sep 17 00:00:00 2001 From: uraymeiviar Date: Fri, 6 Nov 2015 22:25:25 +0700 Subject: fix build settings for DLL project, runtime library must be linked to DLL too to prevent heap deallocation error --- win32/VS2015/celt.vcxproj | 20 ++++++++++---------- win32/VS2015/opus.vcxproj | 20 ++++++++++---------- win32/VS2015/opus_demo.vcxproj | 20 ++++++++++---------- win32/VS2015/silk_common.vcxproj | 20 ++++++++++---------- win32/VS2015/silk_fixed.vcxproj | 20 ++++++++++---------- win32/VS2015/silk_float.vcxproj | 20 ++++++++++---------- win32/VS2015/test_opus_api.vcxproj | 20 ++++++++++---------- win32/VS2015/test_opus_decode.vcxproj | 20 ++++++++++---------- win32/VS2015/test_opus_encode.vcxproj | 20 ++++++++++---------- 9 files changed, 90 insertions(+), 90 deletions(-) (limited to 'win32') diff --git a/win32/VS2015/celt.vcxproj b/win32/VS2015/celt.vcxproj index dd14d719..273ee4df 100644 --- a/win32/VS2015/celt.vcxproj +++ b/win32/VS2015/celt.vcxproj @@ -235,7 +235,7 @@ false Disabled false - true + false Guard false false @@ -269,7 +269,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories) - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -277,7 +277,7 @@ false Disabled false - true + false Guard false false @@ -320,7 +320,7 @@ Disabled false false - true + false Guard false false @@ -354,7 +354,7 @@ Disabled HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) ..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories) - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -363,7 +363,7 @@ Disabled false false - true + false Guard false false @@ -447,7 +447,7 @@ true HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories) - MultiThreaded + MultiThreadedDLL None false false @@ -463,7 +463,7 @@ false false true - Fast + Precise false false false @@ -547,7 +547,7 @@ true HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) ..\;..\..\include;..\..\celt;..\..\silk;..\..\silk\float;..\..\silk\fixed;%(AdditionalIncludeDirectories) - MultiThreaded + MultiThreadedDLL None false false @@ -563,7 +563,7 @@ false false true - Fast + Precise false false false diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj index 65b94219..74bf75b3 100644 --- a/win32/VS2015/opus.vcxproj +++ b/win32/VS2015/opus.vcxproj @@ -177,7 +177,7 @@ true false false - true + false NoExtensions @@ -207,7 +207,7 @@ HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug + MultiThreadedDebugDLL Level3 ProgramDatabase Disabled @@ -224,7 +224,7 @@ true false false - true + false NoExtensions @@ -273,7 +273,7 @@ true false false - true + false NoExtensions @@ -302,7 +302,7 @@ HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreadedDebug + MultiThreadedDebugDLL Level3 ProgramDatabase Disabled @@ -320,7 +320,7 @@ true false false - true + false NoExtensions @@ -402,7 +402,7 @@ HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreaded + MultiThreadedDLL Level3 None true @@ -422,7 +422,7 @@ false true true - Fast + Precise false false false @@ -506,7 +506,7 @@ HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ../../silk;../../celt;../../win32;../../include;%(AdditionalIncludeDirectories) - MultiThreaded + MultiThreadedDLL Level3 None 4996 @@ -526,7 +526,7 @@ false true true - Fast + Precise false false false diff --git a/win32/VS2015/opus_demo.vcxproj b/win32/VS2015/opus_demo.vcxproj index fb1f292b..2aa41a6f 100644 --- a/win32/VS2015/opus_demo.vcxproj +++ b/win32/VS2015/opus_demo.vcxproj @@ -186,7 +186,7 @@ false Disabled false - true + false Guard false false @@ -208,7 +208,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -216,7 +216,7 @@ false Disabled false - true + false Guard false false @@ -247,7 +247,7 @@ Disabled false false - true + false Guard false false @@ -269,7 +269,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -278,7 +278,7 @@ Disabled false false - true + false Guard false false @@ -338,7 +338,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; true None @@ -355,7 +355,7 @@ false false true - Fast + Precise false false false @@ -412,7 +412,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; true None @@ -429,7 +429,7 @@ false false true - Fast + Precise false false false diff --git a/win32/VS2015/silk_common.vcxproj b/win32/VS2015/silk_common.vcxproj index cb4c6f7a..2df939b0 100644 --- a/win32/VS2015/silk_common.vcxproj +++ b/win32/VS2015/silk_common.vcxproj @@ -173,7 +173,7 @@ false Disabled false - true + false Guard false false @@ -210,7 +210,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -218,7 +218,7 @@ false Disabled false - true + false Guard false false @@ -264,7 +264,7 @@ Disabled false false - true + false Guard false false @@ -301,7 +301,7 @@ Disabled HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -310,7 +310,7 @@ Disabled false false - true + false Guard false false @@ -400,8 +400,8 @@ true HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include - MultiThreaded - Fast + MultiThreadedDLL + Precise None false false @@ -506,8 +506,8 @@ true HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk/float;../../silk;../../win32;../../celt;../../include - MultiThreaded - Fast + MultiThreadedDLL + Precise None false false diff --git a/win32/VS2015/silk_fixed.vcxproj b/win32/VS2015/silk_fixed.vcxproj index c2a4f345..ba1b5152 100644 --- a/win32/VS2015/silk_fixed.vcxproj +++ b/win32/VS2015/silk_fixed.vcxproj @@ -170,7 +170,7 @@ false Disabled false - true + false Guard false false @@ -195,7 +195,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -203,7 +203,7 @@ false Disabled false - true + false Guard false false @@ -237,7 +237,7 @@ Disabled false false - true + false Guard false false @@ -262,7 +262,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -271,7 +271,7 @@ Disabled false false - true + false Guard false false @@ -337,7 +337,7 @@ true HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreaded + MultiThreadedDLL None false false @@ -353,7 +353,7 @@ false false true - Fast + Precise false false false @@ -419,7 +419,7 @@ true HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ../..;../../silk/fixed;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreaded + MultiThreadedDLL None false false @@ -435,7 +435,7 @@ false false true - Fast + Precise false false false diff --git a/win32/VS2015/silk_float.vcxproj b/win32/VS2015/silk_float.vcxproj index b8beac19..e55e76d1 100644 --- a/win32/VS2015/silk_float.vcxproj +++ b/win32/VS2015/silk_float.vcxproj @@ -172,7 +172,7 @@ false Disabled false - true + false Guard false false @@ -209,7 +209,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -217,7 +217,7 @@ false Disabled false - true + false Guard false false @@ -263,7 +263,7 @@ Disabled false false - true + false Guard false false @@ -300,7 +300,7 @@ Disabled HAVE_CONFIG_H;WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -309,7 +309,7 @@ Disabled false false - true + false Guard false false @@ -399,7 +399,7 @@ true HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreaded + MultiThreadedDLL None false false @@ -415,7 +415,7 @@ false false true - Fast + Precise false false false @@ -505,7 +505,7 @@ true HAVE_CONFIG_H;WIN32;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) ../../silk/float;../../silk;../../win32;../../celt;../../include;../win32 - MultiThreaded + MultiThreadedDLL None false false @@ -521,7 +521,7 @@ false false true - Fast + Precise false false false diff --git a/win32/VS2015/test_opus_api.vcxproj b/win32/VS2015/test_opus_api.vcxproj index 2dc3eec5..302752d1 100644 --- a/win32/VS2015/test_opus_api.vcxproj +++ b/win32/VS2015/test_opus_api.vcxproj @@ -186,7 +186,7 @@ false Disabled false - true + false Guard false false @@ -208,7 +208,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -216,7 +216,7 @@ false Disabled false - true + false Guard false false @@ -247,7 +247,7 @@ Disabled false false - true + false Guard false false @@ -269,7 +269,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL ProgramDatabase false false @@ -278,7 +278,7 @@ Disabled false false - true + false Guard false false @@ -338,7 +338,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; None false @@ -355,7 +355,7 @@ false false true - Fast + Precise false false false @@ -412,7 +412,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; None false @@ -429,7 +429,7 @@ false false true - Fast + Precise false false false diff --git a/win32/VS2015/test_opus_decode.vcxproj b/win32/VS2015/test_opus_decode.vcxproj index 38883b6d..ef6279c4 100644 --- a/win32/VS2015/test_opus_decode.vcxproj +++ b/win32/VS2015/test_opus_decode.vcxproj @@ -187,7 +187,7 @@ false Disabled false - true + false Guard false false @@ -209,7 +209,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL 4996 ProgramDatabase false @@ -218,7 +218,7 @@ false Disabled false - true + false Guard false false @@ -250,7 +250,7 @@ Disabled false false - true + false Guard false false @@ -272,7 +272,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL 4996 ProgramDatabase false @@ -282,7 +282,7 @@ Disabled false false - true + false Guard false false @@ -343,7 +343,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; 4996 None @@ -361,7 +361,7 @@ false false true - Fast + Precise false false false @@ -419,7 +419,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; 4996 None @@ -437,7 +437,7 @@ false false true - Fast + Precise false false false diff --git a/win32/VS2015/test_opus_encode.vcxproj b/win32/VS2015/test_opus_encode.vcxproj index 1de78a80..e2fa7257 100644 --- a/win32/VS2015/test_opus_encode.vcxproj +++ b/win32/VS2015/test_opus_encode.vcxproj @@ -187,7 +187,7 @@ false Disabled false - true + false Guard false false @@ -209,7 +209,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL 4996 ProgramDatabase false @@ -218,7 +218,7 @@ false Disabled false - true + false Guard false false @@ -250,7 +250,7 @@ Disabled false false - true + false Guard false false @@ -272,7 +272,7 @@ Disabled HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..\silk;..\..\celt;..\;..\..\include; - MultiThreadedDebug + MultiThreadedDebugDLL 4996 ProgramDatabase false @@ -282,7 +282,7 @@ Disabled false false - true + false Guard false false @@ -343,7 +343,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; 4996 None @@ -361,7 +361,7 @@ false false true - Fast + Precise false false false @@ -419,7 +419,7 @@ true true HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ..\..\silk;..\..\celt;..\;..\..\include; 4996 None @@ -437,7 +437,7 @@ false false true - Fast + Precise false false false -- cgit v1.2.3