use #include "libusb.h" in the samples

* also removed unneeded ../msvc/ lib dir for VS2005

11 files changed, 25 insertions, 33 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 06af0bc..e8a4516 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)/libusb
 noinst_PROGRAMS = xusb lsusb
 
 lsusb_SOURCES = lsusb.c
diff --git a/examples/_lsusb_2008.vcproj b/examples/_lsusb_2008.vcproj
index e643d9b..8fe7584 100644
--- a/examples/_lsusb_2008.vcproj
+++ b/examples/_lsusb_2008.vcproj
@@ -45,7 +45,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				RuntimeLibrary="1"

 				WarningLevel="3"

@@ -117,7 +117,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				RuntimeLibrary="1"

 				WarningLevel="3"

@@ -188,7 +188,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="0"

 				WarningLevel="3"

@@ -258,7 +258,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="0"

 				WarningLevel="3"

diff --git a/examples/_xusb_2008.vcproj b/examples/_xusb_2008.vcproj
index 71dcf44..3c056a0 100644
--- a/examples/_xusb_2008.vcproj
+++ b/examples/_xusb_2008.vcproj
@@ -45,7 +45,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="true"

 				RuntimeLibrary="1"

@@ -117,7 +117,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="true"

 				RuntimeLibrary="1"

@@ -188,7 +188,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="0"

 				WarningLevel="3"

@@ -257,7 +257,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="0"

 				WarningLevel="3"

diff --git a/examples/lsusb.c b/examples/lsusb.c
index 317adf0..e36e0c1 100644
--- a/examples/lsusb.c
+++ b/examples/lsusb.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include <libusb/libusb.h>
+#include "libusb.h"
 
 static void print_devs(libusb_device **devs)
 {
diff --git a/examples/lsusb.dsp b/examples/lsusb.dsp
index af78cba..c1e99d3 100644
--- a/examples/lsusb.dsp
+++ b/examples/lsusb.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 ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /EHsc /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /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 ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /EHsc /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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

diff --git a/examples/lsusb.vcproj b/examples/lsusb.vcproj
index dda751f..8c75099 100644
--- a/examples/lsusb.vcproj
+++ b/examples/lsusb.vcproj
@@ -43,7 +43,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -65,7 +65,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"

@@ -120,7 +119,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

@@ -140,7 +139,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

@@ -198,7 +196,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -220,7 +218,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="17"

@@ -276,7 +273,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\"

+				AdditionalIncludeDirectories="..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

@@ -296,7 +293,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

diff --git a/examples/lsusb_sources b/examples/lsusb_sources
index 444a1e9..dbfefbb 100644
--- a/examples/lsusb_sources
+++ b/examples/lsusb_sources
@@ -14,6 +14,6 @@ USE_MSVCRT=1
 !ENDIF
 
 UMTYPE=console
-INCLUDES=..\..;$(DDK_INC_PATH)
+INCLUDES=..\..\libusb;$(DDK_INC_PATH)
 UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
 SOURCES=..\lsusb.c
diff --git a/examples/xusb.c b/examples/xusb.c
index f90f2c9..812e81f 100644
--- a/examples/xusb.c
+++ b/examples/xusb.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <libusb/libusb.h>
+#include "libusb.h"
 
 #ifdef OS_WINDOWS
 #define msleep(msecs) Sleep(msecs)
diff --git a/examples/xusb.dsp b/examples/xusb.dsp
index ce97888..5517473 100644
--- a/examples/xusb.dsp
+++ b/examples/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 ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /EHsc /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 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 ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /EHsc /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 BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/examples/xusb.vcproj b/examples/xusb.vcproj
index d65163f..5837f2e 100644
--- a/examples/xusb.vcproj
+++ b/examples/xusb.vcproj
@@ -43,7 +43,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -65,7 +65,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"

@@ -120,7 +119,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

@@ -140,7 +139,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

@@ -198,7 +196,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -220,7 +218,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="17"

@@ -276,7 +273,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\msvc;..\"

+				AdditionalIncludeDirectories="..\msvc;..\libusb"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

@@ -296,7 +293,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\msvc"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

diff --git a/examples/xusb_sources b/examples/xusb_sources
index ea1b8f4..b43f94f 100644
--- a/examples/xusb_sources
+++ b/examples/xusb_sources
@@ -15,6 +15,6 @@ USE_MSVCRT=1
 !ENDIF
 
 UMTYPE=console
-INCLUDES=..\..\msvc;..\..;$(DDK_INC_PATH)
+INCLUDES=..\..\msvc;..\..\libusb;$(DDK_INC_PATH)
 UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
 SOURCES=..\xusb.c