diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-11-27 15:22:29 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-11-27 15:22:29 -0800 |
| commit | f2e551a5ff03325505bf90796887d4fc0093a99b (patch) | |
| tree | f066080798a294e177c7b9063971c54e83f75675 /msvc | |
| parent | 9d23ed25b44ae351eaf839805722d6796f9b018a (diff) | |
| download | libusb-f2e551a5ff03325505bf90796887d4fc0093a99b.tar.gz | |
build: Prepare config.h for inclusion in examples/tests
There are certain games played in the examples and tests source to
account for differences in build environments and target platforms. This
can be simplified by including config.h and using the definitions there.
To that end, move the printf function attribute definition from
libusbi.h to config.h and leverage it where it is used in the examples
and tests.
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'msvc')
33 files changed, 52 insertions, 16 deletions
diff --git a/msvc/config.h b/msvc/config.h index 2e0a01a..8aafd9d 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -50,5 +50,9 @@ /* Define to 1 if compiling for a Windows platform. */ #define PLATFORM_WINDOWS 1 +/* Define to the attribute for enabling parameter checks on printf-like + functions. */ +#define PRINTF_FORMAT(a, b) /**/ + /* Define to 1 to output logging messages to the systemwide log. */ /* #undef USE_SYSTEM_LOGGING_FACILITY */ diff --git a/msvc/fxload_2013.vcxproj b/msvc/fxload_2013.vcxproj index 00f5c8d..2419fe9 100644 --- a/msvc/fxload_2013.vcxproj +++ b/msvc/fxload_2013.vcxproj @@ -73,6 +73,7 @@ <ClCompile Include="..\examples\fxload.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\examples\ezusb.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/fxload_2013.vcxproj.filters b/msvc/fxload_2013.vcxproj.filters index 2d6fbc9..fa1bb78 100644 --- a/msvc/fxload_2013.vcxproj.filters +++ b/msvc/fxload_2013.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\examples\ezusb.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/fxload_2015.vcxproj b/msvc/fxload_2015.vcxproj index bd4a851..9e8ae62 100644 --- a/msvc/fxload_2015.vcxproj +++ b/msvc/fxload_2015.vcxproj @@ -73,6 +73,7 @@ <ClCompile Include="..\examples\fxload.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\examples\ezusb.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/fxload_2015.vcxproj.filters b/msvc/fxload_2015.vcxproj.filters index 2d6fbc9..fa1bb78 100644 --- a/msvc/fxload_2015.vcxproj.filters +++ b/msvc/fxload_2015.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\examples\ezusb.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/fxload_2017.vcxproj b/msvc/fxload_2017.vcxproj index 61f312b..9db5072 100644 --- a/msvc/fxload_2017.vcxproj +++ b/msvc/fxload_2017.vcxproj @@ -92,6 +92,7 @@ <ClCompile Include="..\examples\fxload.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\examples\ezusb.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/fxload_2017.vcxproj.filters b/msvc/fxload_2017.vcxproj.filters index 2d6fbc9..fa1bb78 100644 --- a/msvc/fxload_2017.vcxproj.filters +++ b/msvc/fxload_2017.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\examples\ezusb.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/fxload_2019.vcxproj b/msvc/fxload_2019.vcxproj index 131c82a..7a98720 100644 --- a/msvc/fxload_2019.vcxproj +++ b/msvc/fxload_2019.vcxproj @@ -92,6 +92,7 @@ <ClCompile Include="..\examples\fxload.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\examples\ezusb.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/fxload_2019.vcxproj.filters b/msvc/fxload_2019.vcxproj.filters index 2d6fbc9..fa1bb78 100644 --- a/msvc/fxload_2019.vcxproj.filters +++ b/msvc/fxload_2019.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\examples\ezusb.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/hotplugtest_2013.vcxproj b/msvc/hotplugtest_2013.vcxproj index 915392c..4e71963 100644 --- a/msvc/hotplugtest_2013.vcxproj +++ b/msvc/hotplugtest_2013.vcxproj @@ -45,7 +45,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/hotplugtest_2015.vcxproj b/msvc/hotplugtest_2015.vcxproj index 2b39f6e..4af9f30 100644 --- a/msvc/hotplugtest_2015.vcxproj +++ b/msvc/hotplugtest_2015.vcxproj @@ -46,7 +46,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/hotplugtest_2017.vcxproj b/msvc/hotplugtest_2017.vcxproj index 2c48c78..9342d7d 100644 --- a/msvc/hotplugtest_2017.vcxproj +++ b/msvc/hotplugtest_2017.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/hotplugtest_2019.vcxproj b/msvc/hotplugtest_2019.vcxproj index 0aa1db6..9adec6b 100644 --- a/msvc/hotplugtest_2019.vcxproj +++ b/msvc/hotplugtest_2019.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/listdevs_2013.vcxproj b/msvc/listdevs_2013.vcxproj index b1c51fd..99b364a 100644 --- a/msvc/listdevs_2013.vcxproj +++ b/msvc/listdevs_2013.vcxproj @@ -45,7 +45,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/listdevs_2015.vcxproj b/msvc/listdevs_2015.vcxproj index 110fa5a..f259d12 100644 --- a/msvc/listdevs_2015.vcxproj +++ b/msvc/listdevs_2015.vcxproj @@ -46,7 +46,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/listdevs_2017.vcxproj b/msvc/listdevs_2017.vcxproj index b685238..9f10864 100644 --- a/msvc/listdevs_2017.vcxproj +++ b/msvc/listdevs_2017.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/listdevs_2019.vcxproj b/msvc/listdevs_2019.vcxproj index cbab3d4..b414615 100644 --- a/msvc/listdevs_2019.vcxproj +++ b/msvc/listdevs_2019.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/stress_2013.vcxproj b/msvc/stress_2013.vcxproj index 83c1f16..cc762cc 100644 --- a/msvc/stress_2013.vcxproj +++ b/msvc/stress_2013.vcxproj @@ -73,6 +73,7 @@ <ClCompile Include="..\tests\testlib.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\tests\libusb_testlib.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/stress_2013.vcxproj.filters b/msvc/stress_2013.vcxproj.filters index 9d821b3..51b38c8 100644 --- a/msvc/stress_2013.vcxproj.filters +++ b/msvc/stress_2013.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\tests\libusb_testlib.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/stress_2015.vcxproj b/msvc/stress_2015.vcxproj index 85a2cc3..21d42ef 100644 --- a/msvc/stress_2015.vcxproj +++ b/msvc/stress_2015.vcxproj @@ -73,6 +73,7 @@ <ClCompile Include="..\tests\testlib.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\tests\libusb_testlib.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/stress_2015.vcxproj.filters b/msvc/stress_2015.vcxproj.filters index 9d821b3..51b38c8 100644 --- a/msvc/stress_2015.vcxproj.filters +++ b/msvc/stress_2015.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\tests\libusb_testlib.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/stress_2017.vcxproj b/msvc/stress_2017.vcxproj index d2dea81..064f21d 100644 --- a/msvc/stress_2017.vcxproj +++ b/msvc/stress_2017.vcxproj @@ -92,6 +92,7 @@ <ClCompile Include="..\tests\testlib.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\tests\libusb_testlib.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/stress_2017.vcxproj.filters b/msvc/stress_2017.vcxproj.filters index 9d821b3..51b38c8 100644 --- a/msvc/stress_2017.vcxproj.filters +++ b/msvc/stress_2017.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\tests\libusb_testlib.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/stress_2019.vcxproj b/msvc/stress_2019.vcxproj index a89920f..0eed3cc 100644 --- a/msvc/stress_2019.vcxproj +++ b/msvc/stress_2019.vcxproj @@ -92,6 +92,7 @@ <ClCompile Include="..\tests\testlib.c" /> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h" /> <ClInclude Include="..\tests\libusb_testlib.h" /> </ItemGroup> <ItemGroup> diff --git a/msvc/stress_2019.vcxproj.filters b/msvc/stress_2019.vcxproj.filters index 9d821b3..51b38c8 100644 --- a/msvc/stress_2019.vcxproj.filters +++ b/msvc/stress_2019.vcxproj.filters @@ -11,6 +11,9 @@ </Filter> </ItemGroup> <ItemGroup> + <ClInclude Include=".\config.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\tests\libusb_testlib.h"> <Filter>Header Files</Filter> </ClInclude> diff --git a/msvc/testlibusb_2013.vcxproj b/msvc/testlibusb_2013.vcxproj index 4c8a107..0117503 100644 --- a/msvc/testlibusb_2013.vcxproj +++ b/msvc/testlibusb_2013.vcxproj @@ -45,7 +45,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/testlibusb_2015.vcxproj b/msvc/testlibusb_2015.vcxproj index 609e23a..1cf7ee4 100644 --- a/msvc/testlibusb_2015.vcxproj +++ b/msvc/testlibusb_2015.vcxproj @@ -46,7 +46,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/testlibusb_2017.vcxproj b/msvc/testlibusb_2017.vcxproj index 67c7c88..029e3bd 100644 --- a/msvc/testlibusb_2017.vcxproj +++ b/msvc/testlibusb_2017.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/testlibusb_2019.vcxproj b/msvc/testlibusb_2019.vcxproj index aec8c07..d7a54b2 100644 --- a/msvc/testlibusb_2019.vcxproj +++ b/msvc/testlibusb_2019.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/xusb_2013.vcxproj b/msvc/xusb_2013.vcxproj index 195c73d..df27d9c 100644 --- a/msvc/xusb_2013.vcxproj +++ b/msvc/xusb_2013.vcxproj @@ -45,7 +45,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/xusb_2015.vcxproj b/msvc/xusb_2015.vcxproj index 1393007..ab88230 100644 --- a/msvc/xusb_2015.vcxproj +++ b/msvc/xusb_2015.vcxproj @@ -46,7 +46,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/xusb_2017.vcxproj b/msvc/xusb_2017.vcxproj index 7ffb546..30be16c 100644 --- a/msvc/xusb_2017.vcxproj +++ b/msvc/xusb_2017.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> diff --git a/msvc/xusb_2019.vcxproj b/msvc/xusb_2019.vcxproj index adefefb..44a165f 100644 --- a/msvc/xusb_2019.vcxproj +++ b/msvc/xusb_2019.vcxproj @@ -65,7 +65,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> </ClCompile> |