diff options
author | Pete Batard <pbatard@gmail.com> | 2010-01-21 17:38:43 +0000 |
---|---|---|
committer | Pete Batard <pbatard@gmail.com> | 2010-01-21 17:38:43 +0000 |
commit | 5e98c8b1a34599c394dbba23a607eec03de297b8 (patch) | |
tree | d84ffe0418a99193910134c39f70bd8844610c2c | |
parent | a535ea35cd534e7b1d478dd37cbfcda8f1517c8f (diff) | |
download | libusb-5e98c8b1a34599c394dbba23a607eec03de297b8.tar.gz |
r99: DDK/sources x64 final fix and additional MSVC fixes (/MT)
-rw-r--r-- | config_msvc.h | 9 | ||||
-rw-r--r-- | examples/lsusb_2008.vcproj | 8 | ||||
-rw-r--r-- | examples/xusb_2008.vcproj | 8 | ||||
-rw-r--r-- | libusb-dll_2008.vcproj | 8 | ||||
-rw-r--r-- | libusb-static_2008.vcproj | 8 | ||||
-rw-r--r-- | libusb/os/sources | 2 |
6 files changed, 17 insertions, 26 deletions
diff --git a/config_msvc.h b/config_msvc.h index 77fe89b..a8beca6 100644 --- a/config_msvc.h +++ b/config_msvc.h @@ -1,8 +1,5 @@ /* config_msvc.h. Manual config.h for MSVC. */ -/* Default visibility */ -#define API_EXPORTED /**/ - /* Debug message logging */ #define ENABLE_DEBUG_LOGGING 1 @@ -41,9 +38,3 @@ /* Version number of package */ #define VERSION "1.0.5" - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif diff --git a/examples/lsusb_2008.vcproj b/examples/lsusb_2008.vcproj index e93fd90..8316fe9 100644 --- a/examples/lsusb_2008.vcproj +++ b/examples/lsusb_2008.vcproj @@ -49,7 +49,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="4" @@ -126,7 +126,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -202,7 +202,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" @@ -282,7 +282,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/examples/xusb_2008.vcproj b/examples/xusb_2008.vcproj index 5b156b2..4cd9b13 100644 --- a/examples/xusb_2008.vcproj +++ b/examples/xusb_2008.vcproj @@ -49,7 +49,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="4" @@ -126,7 +126,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -202,7 +202,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" @@ -282,7 +282,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\msvc;..\" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" diff --git a/libusb-dll_2008.vcproj b/libusb-dll_2008.vcproj index fdc1194..385efab 100644 --- a/libusb-dll_2008.vcproj +++ b/libusb-dll_2008.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" DebugInformationFormat="4" /> @@ -121,7 +121,7 @@ PreprocessorDefinitions="_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" DebugInformationFormat="3" /> @@ -194,7 +194,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" @@ -268,7 +268,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" diff --git a/libusb-static_2008.vcproj b/libusb-static_2008.vcproj index 13cad06..e17235c 100644 --- a/libusb-static_2008.vcproj +++ b/libusb-static_2008.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" DebugInformationFormat="4" /> @@ -110,7 +110,7 @@ PreprocessorDefinitions="_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" DebugInformationFormat="3" /> @@ -172,7 +172,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" @@ -236,7 +236,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" diff --git a/libusb/os/sources b/libusb/os/sources index f2018d5..86e0abe 100644 --- a/libusb/os/sources +++ b/libusb/os/sources @@ -7,7 +7,7 @@ DLLDEF=..\libusb-1.0.def MSC_WARNING_LEVEL=/W3 !ENDIF -!IFDEF _AMD64bit +!IF "$(_BUILDARCH)"=="AMD64" PTHREAD_LIB=pthreadVC2_x64.lib !ELSE PTHREAD_LIB=pthreadVC2.lib |