summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pbatard@gmail.com>2010-11-22 23:13:32 +0000
committerPete Batard <pbatard@gmail.com>2010-11-22 23:20:40 +0000
commit54e71cdd7c412ea83b9fd6f617239db665e70cb2 (patch)
tree045068a07b78f80229b64c389f3ba473371d3f49
parent6a40875ed84834eb5423499f2c9c73b1c2084fc0 (diff)
downloadlibusb-54e71cdd7c412ea83b9fd6f617239db665e70cb2.tar.gz
moved MSVC projects files to /msvc
-rw-r--r--msvc/libusb.dsw (renamed from libusb.dsw)4
-rw-r--r--msvc/libusb.sln (renamed from libusb.sln)4
-rw-r--r--msvc/libusb_dll.dsp (renamed from libusb_dll.dsp)54
-rw-r--r--msvc/libusb_dll.vcproj (renamed from libusb_dll.vcproj)62
-rw-r--r--msvc/libusb_static.dsp (renamed from libusb_static.dsp)54
-rw-r--r--msvc/libusb_static.vcproj (renamed from libusb_static.vcproj)50
-rw-r--r--msvc/lsusb.dsp (renamed from examples/lsusb.dsp)2
-rw-r--r--msvc/lsusb.vcproj (renamed from examples/lsusb.vcproj)18
-rw-r--r--msvc/xusb.dsp (renamed from examples/xusb.dsp)6
-rw-r--r--msvc/xusb.vcproj (renamed from examples/xusb.vcproj)26
10 files changed, 140 insertions, 140 deletions
diff --git a/libusb.dsw b/msvc/libusb.dsw
index 642d417..d6416a4 100644
--- a/libusb.dsw
+++ b/msvc/libusb.dsw
@@ -27,7 +27,7 @@ Package=<4>
###############################################################################
-Project: "lsusb"=".\EXAMPLES\lsusb.dsp" - Package Owner=<4>
+Project: "lsusb"=".\lsusb.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -42,7 +42,7 @@ Package=<4>
###############################################################################
-Project: "xusb"=".\examples\xusb.dsp" - Package Owner=<4>
+Project: "xusb"=".\xusb.dsp" - Package Owner=<4>
Package=<5>
{{{
diff --git a/libusb.sln b/msvc/libusb.sln
index b56802c..d005b64 100644
--- a/libusb.sln
+++ b/msvc/libusb.sln
@@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "examples\lsusb.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "lsusb.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
@@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "examples\lsusb.vcp
{5AB6B770-1925-48D5-ABC2-930F3259C020} = {5AB6B770-1925-48D5-ABC2-930F3259C020}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "examples\xusb.vcproj", "{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xusb", "xusb.vcproj", "{08A6FA39-21B7-4A05-9252-2F9864A5E5A4}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
diff --git a/libusb_dll.dsp b/msvc/libusb_dll.dsp
index 324c373..65a99d7 100644
--- a/libusb_dll.dsp
+++ b/msvc/libusb_dll.dsp
@@ -38,12 +38,12 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Win32/Release/dll"
-# PROP Intermediate_Dir "Win32/Release/dll"
+# PROP Output_Dir "../Win32/Release/dll"
+# PROP Intermediate_Dir "../Win32/Release/dll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUSB_DLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "msvc" /I "libusb" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -64,12 +64,12 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Win32/Debug/dll"
-# PROP Intermediate_Dir "Win32/Debug/dll"
+# PROP Output_Dir "../Win32/Debug/dll"
+# PROP Intermediate_Dir "../Win32/Debug/dll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUSB_DLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "msvc" /I "libusb" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /EHsc /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -93,49 +93,49 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\libusb\core.c
+SOURCE=..\libusb\core.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\darwin_usb.c
+SOURCE=..\libusb\os\darwin_usb.c
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\libusb\descriptor.c
+SOURCE=..\libusb\descriptor.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\io.c
+SOURCE=..\libusb\io.c
# End Source File
# Begin Source File
-SOURCE=".\libusb\libusb-1.0.rc"
+SOURCE="..\libusb\libusb-1.0.rc"
# End Source File
# Begin Source File
-SOURCE=".\libusb\libusb-1.0.def"
+SOURCE="..\libusb\libusb-1.0.def"
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\linux_usbfs.c
+SOURCE=..\libusb\os\linux_usbfs.c
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\poll_windows.c
+SOURCE=..\libusb\os\poll_windows.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\sync.c
+SOURCE=..\libusb\sync.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\threads_windows.c
+SOURCE=..\libusb\os\threads_windows.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_usb.c
+SOURCE=..\libusb\os\windows_usb.c
# End Source File
# End Group
# Begin Group "Header Files"
@@ -143,43 +143,43 @@ SOURCE=.\libusb\os\windows_usb.c
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\msvc\config.h
+SOURCE=.\config.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\darwin_usb.h
+SOURCE=..\libusb\os\darwin_usb.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\libusb.h
+SOURCE=..\libusb\libusb.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\libusbi.h
+SOURCE=..\libusb\libusbi.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\linux_usbfs.h
+SOURCE=..\libusb\os\linux_usbfs.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\poll_posix.h
+SOURCE=..\libusb\os\poll_posix.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\poll_windows.h
+SOURCE=..\libusb\os\poll_windows.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\threads_posix.h
+SOURCE=..\libusb\os\threads_posix.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\threads_windows.h
+SOURCE=..\libusb\os\threads_windows.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_usb.h
+SOURCE=..\libusb\os\windows_usb.h
# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/libusb_dll.vcproj b/msvc/libusb_dll.vcproj
index aa4343e..7e28ff9 100644
--- a/libusb_dll.vcproj
+++ b/msvc/libusb_dll.vcproj
@@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
ConfigurationType="2"
CharacterSet="1"
>
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\libusb-1.0.dll"
LinkIncremental="2"
- ModuleDefinitionFile="libusb\libusb-1.0.def"
+ ModuleDefinitionFile="..\libusb\libusb-1.0.def"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -98,8 +98,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\dll"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\dll\libusb-1.0"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -121,7 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -142,7 +142,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\libusb-1.0.dll"
LinkIncremental="1"
- ModuleDefinitionFile="libusb\libusb-1.0.def"
+ ModuleDefinitionFile="..\libusb\libusb-1.0.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -176,8 +176,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
>
@@ -200,7 +200,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -223,7 +223,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\libusb-1.0.dll"
LinkIncremental="2"
- ModuleDefinitionFile="libusb\libusb-1.0.def"
+ ModuleDefinitionFile="..\libusb\libusb-1.0.def"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
@@ -255,8 +255,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -279,7 +279,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -300,7 +300,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\libusb-1.0.dll"
LinkIncremental="1"
- ModuleDefinitionFile="libusb\libusb-1.0.def"
+ ModuleDefinitionFile="..\libusb\libusb-1.0.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -342,36 +342,36 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\libusb\core.c"
+ RelativePath="..\libusb\core.c"
>
</File>
<File
- RelativePath=".\libusb\descriptor.c"
+ RelativePath="..\libusb\descriptor.c"
>
</File>
<File
- RelativePath=".\libusb\io.c"
+ RelativePath="..\libusb\io.c"
>
</File>
<File
- RelativePath=".\libusb\libusb-1.0.def"
+ RelativePath="..\libusb\libusb-1.0.def"
>
</File>
<File
- RelativePath=".\libusb\sync.c"
+ RelativePath="..\libusb\sync.c"
>
</File>
<File
- RelativePath=".\libusb\os\threads_windows.c"
+ RelativePath="..\libusb\os\threads_windows.c"
>
</File>
<File
- RelativePath=".\libusb\os\poll_windows.c"
+ RelativePath="..\libusb\os\poll_windows.c"
>
</File>
<File
- RelativePath=".\libusb\os\windows_usb.c"
+ RelativePath="..\libusb\os\windows_usb.c"
>
</File>
</Filter>
@@ -381,27 +381,27 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\msvc\config.h"
+ RelativePath=".\config.h"
>
</File>
<File
- RelativePath=".\libusb\libusb.h"
+ RelativePath="..\libusb\libusb.h"
>
</File>
<File
- RelativePath=".\libusb\libusbi.h"
+ RelativePath="..\libusb\libusbi.h"
>
</File>
<File
- RelativePath=".\libusb\os\threads_windows.h"
+ RelativePath="..\libusb\os\threads_windows.h"
>
</File>
<File
- RelativePath=".\libusb\os\poll_windows.h"
+ RelativePath="..\libusb\os\poll_windows.h"
>
</File>
<File
- RelativePath=".\libusb\os\windows_usb.h"
+ RelativePath="..\libusb\os\windows_usb.h"
>
</File>
</Filter>
@@ -411,7 +411,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath=".\libusb\libusb-1.0.rc"
+ RelativePath="..\libusb\libusb-1.0.rc"
>
</File>
</Filter>
diff --git a/libusb_static.dsp b/msvc/libusb_static.dsp
index c98a983..6d366d3 100644
--- a/libusb_static.dsp
+++ b/msvc/libusb_static.dsp
@@ -37,11 +37,11 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Win32/Release/lib"
-# PROP Intermediate_Dir "Win32/Release/lib"
+# PROP Output_Dir "../Win32/Release/lib"
+# PROP Intermediate_Dir "../Win32/Release/lib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "msvc" /I "libusb" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /FD /EHsc /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /FD /EHsc /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Win32/Release/lib/libusb-1.0.lib"
+# ADD LIB32 /nologo /out:"../Win32/Release/lib/libusb-1.0.lib"
!ELSEIF "$(CFG)" == "libusb_static - Win32 Debug"
@@ -60,11 +60,11 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Win32/Debug/lib"
-# PROP Intermediate_Dir "Win32/Debug/lib"
+# PROP Output_Dir "../Win32/Debug/lib"
+# PROP Intermediate_Dir "../Win32/Debug/lib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "msvc" /I "libusb" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /EHsc /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo /n
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Win32/Debug/lib/libusb-1.0.lib"
+# ADD LIB32 /nologo /out:"../Win32/Debug/lib/libusb-1.0.lib"
!ENDIF
@@ -85,41 +85,41 @@ LIB32=link.exe -lib
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\libusb\core.c
+SOURCE=..\libusb\core.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\darwin_usb.c
+SOURCE=..\libusb\os\darwin_usb.c
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\libusb\descriptor.c
+SOURCE=..\libusb\descriptor.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\io.c
+SOURCE=..\libusb\io.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\linux_usbfs.c
+SOURCE=..\libusb\os\linux_usbfs.c
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\poll_windows.c
+SOURCE=..\libusb\os\poll_windows.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\sync.c
+SOURCE=..\libusb\sync.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\threads_windows.c
+SOURCE=..\libusb\os\threads_windows.c
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_usb.c
+SOURCE=..\libusb\os\windows_usb.c
# End Source File
# End Group
# Begin Group "Header Files"
@@ -127,43 +127,43 @@ SOURCE=.\libusb\os\windows_usb.c
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\msvc\config.h
+SOURCE=.\config.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\darwin_usb.h
+SOURCE=..\libusb\os\darwin_usb.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\libusb.h
+SOURCE=..\libusb\libusb.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\libusbi.h
+SOURCE=..\libusb\libusbi.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\linux_usbfs.h
+SOURCE=..\libusb\os\linux_usbfs.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\poll_posix.h
+SOURCE=..\libusb\os\poll_posix.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\poll_windows.h
+SOURCE=..\libusb\os\poll_windows.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\threads_posix.h
+SOURCE=..\libusb\os\threads_posix.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\threads_windows.h
+SOURCE=..\libusb\os\threads_windows.h
# End Source File
# Begin Source File
-SOURCE=.\libusb\os\windows_usb.h
+SOURCE=..\libusb\os\windows_usb.h
# End Source File
# End Group
# End Target
diff --git a/libusb_static.vcproj b/msvc/libusb_static.vcproj
index 8a60ac3..5941d36 100644
--- a/libusb_static.vcproj
+++ b/msvc/libusb_static.vcproj
@@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\lib"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
ConfigurationType="4"
CharacterSet="1"
>
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -84,8 +84,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\lib"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\lib\libusb-1.0"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -107,7 +107,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -146,8 +146,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
@@ -170,7 +170,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -211,8 +211,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -235,7 +235,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\msvc;.\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -282,31 +282,31 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\libusb\core.c"
+ RelativePath="..\libusb\core.c"
>
</File>
<File
- RelativePath=".\libusb\descriptor.c"
+ RelativePath="..\libusb\descriptor.c"
>
</File>
<File
- RelativePath=".\libusb\io.c"
+ RelativePath="..\libusb\io.c"
>
</File>
<File
- RelativePath=".\libusb\sync.c"
+ RelativePath="..\libusb\sync.c"
>
</File>
<File
- RelativePath=".\libusb\os\threads_windows.c"
+ RelativePath="..\libusb\os\threads_windows.c"
>
</File>
<File
- RelativePath=".\libusb\os\poll_windows.c"
+ RelativePath="..\libusb\os\poll_windows.c"
>
</File>
<File
- RelativePath=".\libusb\os\windows_usb.c"
+ RelativePath="..\libusb\os\windows_usb.c"
>
</File>
</Filter>
@@ -316,27 +316,27 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\msvc\config.h"
+ RelativePath=".\config.h"
>
</File>
<File
- RelativePath=".\libusb\libusb.h"
+ RelativePath="..\libusb\libusb.h"
>
</File>
<File
- RelativePath=".\libusb\libusbi.h"
+ RelativePath="..\libusb\libusbi.h"
>
</File>
<File
- RelativePath=".\libusb\os\threads_windows.h"
+ RelativePath="..\libusb\os\threads_windows.h"
>
</File>
<File
- RelativePath=".\libusb\os\poll_windows.h"
+ RelativePath="..\libusb\os\poll_windows.h"
>
</File>
<File
- RelativePath=".\libusb\os\windows_usb.h"
+ RelativePath="..\libusb\os\windows_usb.h"
>
</File>
</Filter>
diff --git a/examples/lsusb.dsp b/msvc/lsusb.dsp
index c1e99d3..4cefcc2 100644
--- a/examples/lsusb.dsp
+++ b/msvc/lsusb.dsp
@@ -88,7 +88,7 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\lsusb.c
+SOURCE=..\examples\lsusb.c
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/examples/lsusb.vcproj b/msvc/lsusb.vcproj
index 8c75099..5923f98 100644
--- a/examples/lsusb.vcproj
+++ b/msvc/lsusb.vcproj
@@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
ConfigurationType="1"
CharacterSet="1"
>
@@ -96,8 +96,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -172,8 +172,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
@@ -249,8 +249,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -334,7 +334,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\lsusb.c"
+ RelativePath="..\examples\lsusb.c"
>
<FileConfiguration
Name="Release|Win32"
diff --git a/examples/xusb.dsp b/msvc/xusb.dsp
index 5517473..ee62f64 100644
--- a/examples/xusb.dsp
+++ b/msvc/xusb.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../msvc" /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /EHsc /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../libusb" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /EHsc /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../msvc" /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../libusb" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /EHsc /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -87,7 +87,7 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\xusb.c
+SOURCE=..\examples\xusb.c
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/examples/xusb.vcproj b/msvc/xusb.vcproj
index 5837f2e..5932af9 100644
--- a/examples/xusb.vcproj
+++ b/msvc/xusb.vcproj
@@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
ConfigurationType="1"
CharacterSet="1"
>
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\msvc;..\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -96,8 +96,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\examples"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\examples\$(ProjectName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\msvc;..\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -172,8 +172,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
@@ -196,7 +196,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\msvc;..\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -249,8 +249,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -273,7 +273,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\msvc;..\libusb"
+ AdditionalIncludeDirectories=".;..\libusb"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -334,7 +334,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\xusb.c"
+ RelativePath="..\examples\xusb.c"
>
</File>
</Filter>