From 4c51b5534f7291c60c7a892ca6cc2e2b0974b2ae Mon Sep 17 00:00:00 2001 From: Pavel A Date: Sat, 28 Mar 2015 23:28:48 +0300 Subject: [PATCH] Added VS projects for VS2015 (CTP6) & related changes --- .../vsproj/hidusb-relay-cmd(vc2015).vcxproj | 163 ++++++++++++++ .../hidusb-relay-cmd(vc2015).vcxproj.filters | 39 ++++ .../usb-relay-dll(vc2015).vcxproj | 197 ++++++++++++++++ .../usb-relay-dll(vc2015).vcxproj.filters | 44 ++++ lib/usb_relay_lib.c | 2 + windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj | 212 ++++++++++++++++++ .../GUIapp(vc2015).vcxproj.filters | 51 +++++ windows-vs/usbrelay(vc2015).sln | 54 +++++ 8 files changed, 762 insertions(+) create mode 100644 commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj create mode 100644 commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj.filters create mode 100644 lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj create mode 100644 lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj.filters create mode 100644 windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj create mode 100644 windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj.filters create mode 100644 windows-vs/usbrelay(vc2015).sln diff --git a/commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj b/commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj new file mode 100644 index 0000000..f267b9a --- /dev/null +++ b/commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + hidusb-relay-cmd + {CF9B07CB-509D-43B5-94FC-2BA43427C093} + hidusb-relay-cmd + Win32Proj + + + + Application + v140_xp + + + Application + v140_xp + + + Application + v140_xp + + + Application + v140_xp + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + Debug\ + true + + + true + + + Release\ + + + + + Disabled + ..;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;DEBUG=1;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + NotUsing + Level3 + ProgramDatabase + + + $(WindowsSDK_LibraryPath_x86);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + Disabled + ..;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;DEBUG=1;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + NotUsing + Level3 + ProgramDatabase + true + + + $(WindowsSDK_LibraryPath_x64);%(AdditionalLibraryDirectories) + true + Console + + + + + ..;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + Level3 + ProgramDatabase + + + $(WindowsSDK_LibraryPath_x86);%(AdditionalLibraryDirectories) + true + Console + true + true + MachineX86 + + + + + ..;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + Level3 + ProgramDatabase + MinSpace + true + + + $(WindowsSDK_LibraryPath_x64);%(AdditionalLibraryDirectories) + true + Console + true + true + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj.filters b/commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj.filters new file mode 100644 index 0000000..11110c6 --- /dev/null +++ b/commandline/vsproj/hidusb-relay-cmd(vc2015).vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + + + + \ No newline at end of file diff --git a/lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj b/lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj new file mode 100644 index 0000000..377720d --- /dev/null +++ b/lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj @@ -0,0 +1,197 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + usb-relay-dll + {0E07152A-666D-4EB4-9049-BDE08C35A86D} + usbrelaydll + Win32Proj + + + + DynamicLibrary + v140 + Unicode + true + + + DynamicLibrary + v140_xp + Unicode + true + + + DynamicLibrary + v140 + Unicode + + + DynamicLibrary + v140_xp + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + usb_relay_device + + + true + usb_relay_device + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + usb_relay_device + + + false + usb_relay_device + + + + Disabled + ../../commandline;..;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS=1;_DEBUG;_WINDOWS;_USRDLL;USBRELAYDLL_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + Default + + + $(OutDir)USB_RELAY_DEVICE.dll + $(WindowsSDK_LibraryPath_x86);%(AdditionalLibraryDirectories) + usb_relay_dll.def + true + Windows + MachineX86 + + + + + Disabled + ../../commandline;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS=1;_DEBUG;_WINDOWS;_USRDLL;USBRELAYDLL_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Default + + + $(OutDir)USB_RELAY_DEVICE.dll + $(WindowsSDK_LibraryPath_x64);%(AdditionalLibraryDirectories) + + + true + Windows + + + + + MaxSpeed + true + ../../commandline;..;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS=1;NDEBUG;_WINDOWS;_USRDLL;USBRELAYDLL_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + MultiThreaded + true + + Level3 + ProgramDatabase + Default + + + $(OutDir)USB_RELAY_DEVICE.dll + $(WindowsSDK_LibraryPath_x86);%(AdditionalLibraryDirectories) + usb_relay_dll.def + true + Windows + true + true + MachineX86 + + + + + MaxSpeed + true + ../../commandline;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS=1;NDEBUG;_WINDOWS;_USRDLL;USBRELAYDLL_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + Default + + + $(OutDir)USB_RELAY_DEVICE.dll + $(WindowsSDK_LibraryPath_x64);%(AdditionalLibraryDirectories) + + + true + Windows + true + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj.filters b/lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj.filters new file mode 100644 index 0000000..305cbb9 --- /dev/null +++ b/lib/usb-relay-dll/usb-relay-dll(vc2015).vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/lib/usb_relay_lib.c b/lib/usb_relay_lib.c index c7aadc2..73ad60c 100644 --- a/lib/usb_relay_lib.c +++ b/lib/usb_relay_lib.c @@ -24,7 +24,9 @@ #define USBRL_CALL __cdecl #define USBRL_API __declspec(dllexport) USBRL_CALL +#if _MSC_VER < 1900 /* before VS2015 */ #define snprintf _snprintf +#endif /* VS2015 */ #endif // _MSC_VER #endif //WIN32 diff --git a/windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj b/windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj new file mode 100644 index 0000000..4d6a379 --- /dev/null +++ b/windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj @@ -0,0 +1,212 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8} + GUIapp + ManagedCProj + + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + true + + + Application + v140 + Unicode + Pure + + + Application + v140 + Unicode + Pure + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + GUIapp + + + true + GUIapp + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + GUIapp + + + false + GUIapp + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + true + + + + $(OutDir);%(AdditionalLibraryDirectories) + true + true + Windows + main + MachineX86 + + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + true + + + + + $(OutDir);%(AdditionalLibraryDirectories) + true + true + Windows + main + + + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + true + + + + $(OutDir);%(AdditionalLibraryDirectories) + true + Windows + main + MachineX86 + + + + + WIN32;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + true + + + + + $(OutDir);%(AdditionalLibraryDirectories) + true + Windows + main + + + + + true + true + + + true + true + + + true + true + + + + + + + + + CppForm + + + + + + + + + + + + + + + Form1.h + Designer + + + + + + \ No newline at end of file diff --git a/windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj.filters b/windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj.filters new file mode 100644 index 0000000..ff5bc55 --- /dev/null +++ b/windows-vs/VS_GUI_demo/GUIapp(vc2015).vcxproj.filters @@ -0,0 +1,51 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + + + + + + Resource Files + + + \ No newline at end of file diff --git a/windows-vs/usbrelay(vc2015).sln b/windows-vs/usbrelay(vc2015).sln new file mode 100644 index 0000000..66f8dc6 --- /dev/null +++ b/windows-vs/usbrelay(vc2015).sln @@ -0,0 +1,54 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.22609.0 +MinimumVisualStudioVersion = 12.0.40219.1 + +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidusb-relay-cmd", "..\commandline\vsproj\hidusb-relay-cmd(vc2015).vcxproj", "{CF9B07CB-509D-43B5-94FC-2BA43427C093}" +EndProject + +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usb-relay-dll", "..\lib\usb-relay-dll\usb-relay-dll(vc2015).vcxproj", "{0E07152A-666D-4EB4-9049-BDE08C35A86D}" +EndProject + +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUIapp(vc2013)", "VS_GUI_demo\GUIapp(vc2015).vcxproj", "{59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}" + ProjectSection(ProjectDependencies) = postProject + {0E07152A-666D-4EB4-9049-BDE08C35A86D} = {0E07152A-666D-4EB4-9049-BDE08C35A86D} + EndProjectSection +EndProject + +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Debug|Win32.Build.0 = Debug|Win32 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Debug|x64.ActiveCfg = Debug|x64 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Debug|x64.Build.0 = Debug|x64 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Release|Win32.ActiveCfg = Release|Win32 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Release|Win32.Build.0 = Release|Win32 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Release|x64.ActiveCfg = Release|x64 + {CF9B07CB-509D-43B5-94FC-2BA43427C093}.Release|x64.Build.0 = Release|x64 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Debug|Win32.ActiveCfg = Debug|Win32 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Debug|Win32.Build.0 = Debug|Win32 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Debug|x64.ActiveCfg = Debug|x64 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Debug|x64.Build.0 = Debug|x64 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Release|Win32.ActiveCfg = Release|Win32 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Release|Win32.Build.0 = Release|Win32 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Release|x64.ActiveCfg = Release|x64 + {0E07152A-666D-4EB4-9049-BDE08C35A86D}.Release|x64.Build.0 = Release|x64 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Debug|Win32.ActiveCfg = Debug|Win32 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Debug|Win32.Build.0 = Debug|Win32 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Debug|x64.ActiveCfg = Debug|x64 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Debug|x64.Build.0 = Debug|x64 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Release|Win32.ActiveCfg = Release|Win32 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Release|Win32.Build.0 = Release|Win32 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Release|x64.ActiveCfg = Release|x64 + {59CCF7A0-C46F-4699-9A55-3A7DFA3333D8}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal -- 2.25.1