removed need for .def file, added LIBUSB_EXPr263

6 files changed, 74 insertions, 179 deletions

diff --git a/libusb/libusb-1.0.def b/libusb/libusb-1.0.def
deleted file mode 100644
index 3261694..0000000
--- a/libusb/libusb-1.0.def
+++ /dev/null
@@ -1,56 +0,0 @@
-LIBRARY
-EXPORTS
-	libusb_init
-	libusb_exit
-	libusb_set_debug
-	libusb_get_device_list
-	libusb_free_device_list
-	libusb_ref_device
-	libusb_unref_device
-	libusb_get_configuration
-	libusb_get_device_descriptor
-	libusb_get_active_config_descriptor
-	libusb_get_config_descriptor
-	libusb_get_config_descriptor_by_value
-	libusb_free_config_descriptor
-	libusb_get_bus_number
-	libusb_get_device_address
-	libusb_get_max_packet_size
-	libusb_get_max_iso_packet_size
-	libusb_open
-	libusb_close
-	libusb_get_device
-	libusb_set_configuration
-	libusb_claim_interface
-	libusb_release_interface
-	libusb_open_device_with_vid_pid
-	libusb_set_interface_alt_setting
-	libusb_clear_halt
-	libusb_reset_device
-	libusb_kernel_driver_active
-	libusb_detach_kernel_driver
-	libusb_attach_kernel_driver
-	libusb_alloc_transfer
-	libusb_submit_transfer
-	libusb_cancel_transfer
-	libusb_free_transfer
-	libusb_control_transfer
-	libusb_bulk_transfer
-	libusb_interrupt_transfer
-	libusb_get_string_descriptor_ascii
-	libusb_try_lock_events
-	libusb_lock_events
-	libusb_unlock_events
-	libusb_event_handling_ok
-	libusb_event_handler_active
-	libusb_lock_event_waiters
-	libusb_unlock_event_waiters
-	libusb_wait_for_event
-	libusb_handle_events_timeout
-	libusb_handle_events
-	libusb_handle_events_locked
-	libusb_pollfds_handle_timeouts
-	libusb_get_next_timeout
-	libusb_get_pollfds
-	libusb_set_pollfd_notifiers
-	libusb_strerror
diff --git a/libusb/libusb.h b/libusb/libusb.h
index cf0187b..8c229e6 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -36,7 +36,7 @@
  * libusb_config_descriptor has an 'interface' member
  * As this can be problematic if you include windows.h after libusb.h
  * in your sources, we force windows.h to be included first. */
-#if (defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__))
+#if     (defined(_WIN32) || defined(__CYGWIN__))
 #include <windows.h>
 #endif
 
@@ -44,13 +44,17 @@
 #undef interface
 #endif
 
-#if !defined(LIBUSB_API)
-#if defined(_WINDOWS_)
+#if     (defined(_WIN32) || defined(__CYGWIN__))&&defined(LIBUSB_DLL_BUILD)
+#define LIBUSB_EXP __declspec(dllexport)
+#else
+#define LIBUSB_EXP
+#endif
+
+#if     (defined(_WIN32) || defined(__CYGWIN__))
 #define LIBUSB_API WINAPI
 #else
 #define LIBUSB_API
 #endif
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -801,51 +805,51 @@ struct libusb_transfer {
 	;
 };
 
-int LIBUSB_API libusb_init(libusb_context **ctx);
-void LIBUSB_API libusb_exit(libusb_context *ctx);
-void LIBUSB_API libusb_set_debug(libusb_context *ctx, int level);
-const char* LIBUSB_API libusb_strerror(enum libusb_error errcode);
+LIBUSB_EXP int LIBUSB_API libusb_init(libusb_context **ctx);
+LIBUSB_EXP void LIBUSB_API libusb_exit(libusb_context *ctx);
+LIBUSB_EXP void LIBUSB_API libusb_set_debug(libusb_context *ctx, int level);
+LIBUSB_EXP const char* LIBUSB_API libusb_strerror(enum libusb_error errcode);
 
-ssize_t LIBUSB_API libusb_get_device_list(libusb_context *ctx,
+LIBUSB_EXP ssize_t LIBUSB_API libusb_get_device_list(libusb_context *ctx,
 	libusb_device ***list);
-void LIBUSB_API libusb_free_device_list(libusb_device **list, int unref_devices);
-libusb_device* LIBUSB_API libusb_ref_device(libusb_device *dev);
-void LIBUSB_API libusb_unref_device(libusb_device *dev);
+LIBUSB_EXP void LIBUSB_API libusb_free_device_list(libusb_device **list, int unref_devices);
+LIBUSB_EXP libusb_device* LIBUSB_API libusb_ref_device(libusb_device *dev);
+LIBUSB_EXP void LIBUSB_API libusb_unref_device(libusb_device *dev);
 
-int LIBUSB_API libusb_get_configuration(libusb_device_handle *dev, int *config);
-int LIBUSB_API libusb_get_device_descriptor(libusb_device *dev,
+LIBUSB_EXP int LIBUSB_API libusb_get_configuration(libusb_device_handle *dev, int *config);
+LIBUSB_EXP int LIBUSB_API libusb_get_device_descriptor(libusb_device *dev,
 	struct libusb_device_descriptor *desc);
-int LIBUSB_API libusb_get_active_config_descriptor(libusb_device *dev,
+LIBUSB_EXP int LIBUSB_API libusb_get_active_config_descriptor(libusb_device *dev,
 	struct libusb_config_descriptor **config);
-int LIBUSB_API libusb_get_config_descriptor(libusb_device *dev, uint8_t config_index,
+LIBUSB_EXP int LIBUSB_API libusb_get_config_descriptor(libusb_device *dev, uint8_t config_index,
 	struct libusb_config_descriptor **config);
-int LIBUSB_API libusb_get_config_descriptor_by_value(libusb_device *dev,
+LIBUSB_EXP int LIBUSB_API libusb_get_config_descriptor_by_value(libusb_device *dev,
 	uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
-void LIBUSB_API libusb_free_config_descriptor(struct libusb_config_descriptor *config);
-uint8_t LIBUSB_API libusb_get_bus_number(libusb_device *dev);
-uint8_t LIBUSB_API libusb_get_device_address(libusb_device *dev);
-int LIBUSB_API libusb_get_max_packet_size(libusb_device *dev, unsigned char endpoint);
-int LIBUSB_API libusb_get_max_iso_packet_size(libusb_device *dev, unsigned char endpoint);
+LIBUSB_EXP void LIBUSB_API libusb_free_config_descriptor(struct libusb_config_descriptor *config);
+LIBUSB_EXP uint8_t LIBUSB_API libusb_get_bus_number(libusb_device *dev);
+LIBUSB_EXP uint8_t LIBUSB_API libusb_get_device_address(libusb_device *dev);
+LIBUSB_EXP int LIBUSB_API libusb_get_max_packet_size(libusb_device *dev, unsigned char endpoint);
+LIBUSB_EXP int LIBUSB_API libusb_get_max_iso_packet_size(libusb_device *dev, unsigned char endpoint);
 
-int LIBUSB_API libusb_open(libusb_device *dev, libusb_device_handle **handle);
-void LIBUSB_API libusb_close(libusb_device_handle *dev_handle);
-libusb_device* LIBUSB_API libusb_get_device(libusb_device_handle *dev_handle);
+LIBUSB_EXP int LIBUSB_API libusb_open(libusb_device *dev, libusb_device_handle **handle);
+LIBUSB_EXP void LIBUSB_API libusb_close(libusb_device_handle *dev_handle);
+LIBUSB_EXP libusb_device* LIBUSB_API libusb_get_device(libusb_device_handle *dev_handle);
 
-int LIBUSB_API libusb_set_configuration(libusb_device_handle *dev, int configuration);
-int LIBUSB_API libusb_claim_interface(libusb_device_handle *dev, int interface_number);
-int LIBUSB_API libusb_release_interface(libusb_device_handle *dev, int interface_number);
+LIBUSB_EXP int LIBUSB_API libusb_set_configuration(libusb_device_handle *dev, int configuration);
+LIBUSB_EXP int LIBUSB_API libusb_claim_interface(libusb_device_handle *dev, int interface_number);
+LIBUSB_EXP int LIBUSB_API libusb_release_interface(libusb_device_handle *dev, int interface_number);
 
-libusb_device_handle* LIBUSB_API libusb_open_device_with_vid_pid(libusb_context *ctx,
+LIBUSB_EXP libusb_device_handle* LIBUSB_API libusb_open_device_with_vid_pid(libusb_context *ctx,
 	uint16_t vendor_id, uint16_t product_id);
 
-int LIBUSB_API libusb_set_interface_alt_setting(libusb_device_handle *dev,
+LIBUSB_EXP int LIBUSB_API libusb_set_interface_alt_setting(libusb_device_handle *dev,
 	int interface_number, int alternate_setting);
-int LIBUSB_API libusb_clear_halt(libusb_device_handle *dev, unsigned char endpoint);
-int LIBUSB_API libusb_reset_device(libusb_device_handle *dev);
+LIBUSB_EXP int LIBUSB_API libusb_clear_halt(libusb_device_handle *dev, unsigned char endpoint);
+LIBUSB_EXP int LIBUSB_API libusb_reset_device(libusb_device_handle *dev);
 
-int LIBUSB_API libusb_kernel_driver_active(libusb_device_handle *dev, int interface_number);
-int LIBUSB_API libusb_detach_kernel_driver(libusb_device_handle *dev, int interface_number);
-int LIBUSB_API libusb_attach_kernel_driver(libusb_device_handle *dev, int interface_number);
+LIBUSB_EXP int LIBUSB_API libusb_kernel_driver_active(libusb_device_handle *dev, int interface_number);
+LIBUSB_EXP int LIBUSB_API libusb_detach_kernel_driver(libusb_device_handle *dev, int interface_number);
+LIBUSB_EXP int LIBUSB_API libusb_attach_kernel_driver(libusb_device_handle *dev, int interface_number);
 
 /* async I/O */
 
@@ -919,10 +923,10 @@ static inline void libusb_fill_control_setup(unsigned char *buffer,
 	setup->wLength = libusb_cpu_to_le16(wLength);
 }
 
-struct libusb_transfer* LIBUSB_API libusb_alloc_transfer(int iso_packets);
-int LIBUSB_API libusb_submit_transfer(struct libusb_transfer *transfer);
-int LIBUSB_API libusb_cancel_transfer(struct libusb_transfer *transfer);
-void LIBUSB_API libusb_free_transfer(struct libusb_transfer *transfer);
+LIBUSB_EXP struct libusb_transfer* LIBUSB_API libusb_alloc_transfer(int iso_packets);
+LIBUSB_EXP int LIBUSB_API libusb_submit_transfer(struct libusb_transfer *transfer);
+LIBUSB_EXP int LIBUSB_API libusb_cancel_transfer(struct libusb_transfer *transfer);
+LIBUSB_EXP void LIBUSB_API libusb_free_transfer(struct libusb_transfer *transfer);
 
 /** \ingroup asyncio
  * Helper function to populate the required \ref libusb_transfer fields
@@ -1149,15 +1153,15 @@ static inline unsigned char *libusb_get_iso_packet_buffer_simple(
 
 /* sync I/O */
 
-int LIBUSB_API libusb_control_transfer(libusb_device_handle *dev_handle,
+LIBUSB_EXP int LIBUSB_API libusb_control_transfer(libusb_device_handle *dev_handle,
 	uint8_t request_type, uint8_t request, uint16_t value, uint16_t index,
 	unsigned char *data, uint16_t length, unsigned int timeout);
 
-int LIBUSB_API libusb_bulk_transfer(libusb_device_handle *dev_handle,
+LIBUSB_EXP int LIBUSB_API libusb_bulk_transfer(libusb_device_handle *dev_handle,
 	unsigned char endpoint, unsigned char *data, int length,
 	int *actual_length, unsigned int timeout);
 
-int LIBUSB_API libusb_interrupt_transfer(libusb_device_handle *dev_handle,
+LIBUSB_EXP int LIBUSB_API libusb_interrupt_transfer(libusb_device_handle *dev_handle,
 	unsigned char endpoint, unsigned char *data, int length,
 	int *actual_length, unsigned int timeout);
 
@@ -1204,25 +1208,25 @@ static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
 		langid, data, (uint16_t)length, 1000);
 }
 
-int LIBUSB_API libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
+LIBUSB_EXP int LIBUSB_API libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
 	uint8_t index, unsigned char *data, int length);
 
 /* polling and timeouts */
 
-int LIBUSB_API libusb_try_lock_events(libusb_context *ctx);
-void LIBUSB_API libusb_lock_events(libusb_context *ctx);
-void LIBUSB_API libusb_unlock_events(libusb_context *ctx);
-int LIBUSB_API libusb_event_handling_ok(libusb_context *ctx);
-int LIBUSB_API libusb_event_handler_active(libusb_context *ctx);
-void LIBUSB_API libusb_lock_event_waiters(libusb_context *ctx);
-void LIBUSB_API libusb_unlock_event_waiters(libusb_context *ctx);
-int LIBUSB_API libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
-
-int LIBUSB_API libusb_handle_events_timeout(libusb_context *ctx, struct timeval *tv);
-int LIBUSB_API libusb_handle_events(libusb_context *ctx);
-int LIBUSB_API libusb_handle_events_locked(libusb_context *ctx, struct timeval *tv);
-int LIBUSB_API libusb_pollfds_handle_timeouts(libusb_context *ctx);
-int LIBUSB_API libusb_get_next_timeout(libusb_context *ctx, struct timeval *tv);
+LIBUSB_EXP int LIBUSB_API libusb_try_lock_events(libusb_context *ctx);
+LIBUSB_EXP void LIBUSB_API libusb_lock_events(libusb_context *ctx);
+LIBUSB_EXP void LIBUSB_API libusb_unlock_events(libusb_context *ctx);
+LIBUSB_EXP int LIBUSB_API libusb_event_handling_ok(libusb_context *ctx);
+LIBUSB_EXP int LIBUSB_API libusb_event_handler_active(libusb_context *ctx);
+LIBUSB_EXP void LIBUSB_API libusb_lock_event_waiters(libusb_context *ctx);
+LIBUSB_EXP void LIBUSB_API libusb_unlock_event_waiters(libusb_context *ctx);
+LIBUSB_EXP int LIBUSB_API libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
+
+LIBUSB_EXP int LIBUSB_API libusb_handle_events_timeout(libusb_context *ctx, struct timeval *tv);
+LIBUSB_EXP int LIBUSB_API libusb_handle_events(libusb_context *ctx);
+LIBUSB_EXP int LIBUSB_API libusb_handle_events_locked(libusb_context *ctx, struct timeval *tv);
+LIBUSB_EXP int LIBUSB_API libusb_pollfds_handle_timeouts(libusb_context *ctx);
+LIBUSB_EXP int LIBUSB_API libusb_get_next_timeout(libusb_context *ctx, struct timeval *tv);
 
 /** \ingroup poll
  * File descriptor for polling
@@ -1261,8 +1265,8 @@ typedef void (LIBUSB_API *libusb_pollfd_added_cb)(int fd, short events, void *us
  */
 typedef void (LIBUSB_API *libusb_pollfd_removed_cb)(int fd, void *user_data);
 
-const struct libusb_pollfd** LIBUSB_API libusb_get_pollfds(libusb_context *ctx);
-void LIBUSB_API libusb_set_pollfd_notifiers(libusb_context *ctx,
+LIBUSB_EXP const struct libusb_pollfd** LIBUSB_API libusb_get_pollfds(libusb_context *ctx);
+LIBUSB_EXP void LIBUSB_API libusb_set_pollfd_notifiers(libusb_context *ctx,
 	libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
 	void *user_data);
 
diff --git a/libusb/os/libusb_sources b/libusb/os/libusb_sources
index 3867d70..a660084 100644
--- a/libusb/os/libusb_sources
+++ b/libusb/os/libusb_sources
@@ -1,8 +1,6 @@
 #TARGETTYPE is not defined, to allow selection between static lib or DLL with ddk_build
 TARGETNAME=libusb-1.0
 
-DLLDEF=..\libusb-1.0.def
-
 !IFNDEF MSC_WARNING_LEVEL
 MSC_WARNING_LEVEL=/W3
 !ENDIF
@@ -11,6 +9,7 @@ USE_MSVCRT=1
 
 INCLUDES=..;..\..;..\..\msvc;$(DDK_INC_PATH)
 C_DEFINES = $(C_DEFINES) /DDDKBUILD
+#### NEED to conditionally (on DLL vs static) #define /DLIBUSB_DLL_BUILD
 
 TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
            $(SDK_LIB_PATH)\advapi32.lib \
diff --git a/libusb_dll.dsp b/libusb_dll.dsp
index 188709a..c4548c0 100644
--- a/libusb_dll.dsp
+++ b/libusb_dll.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 "msvc" /I "libusb" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUSB_DLL_BUILD" /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"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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 "msvc" /I "libusb" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUSB_DLL_BUILD" /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"
@@ -110,10 +110,6 @@ SOURCE=.\libusb\io.c
 # End Source File
 # Begin Source File
 
-SOURCE=".\libusb\libusb-1.0.def"
-# End Source File
-# Begin Source File
-
 SOURCE=".\libusb\libusb-1.0.rc"
 # End Source File
 # Begin Source File
diff --git a/libusb_dll.vcproj b/libusb_dll.vcproj
index 0079cbd..550146f 100644
--- a/libusb_dll.vcproj
+++ b/libusb_dll.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -67,7 +67,6 @@
 				AdditionalDependencies="setupapi.lib ole32.lib advapi32.lib"
 				OutputFile="$(OutDir)\libusb-1.0_debug.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -123,7 +122,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -144,7 +143,6 @@
 				AdditionalDependencies="setupapi.lib ole32.lib advapi32.lib"
 				OutputFile="$(OutDir)\libusb-1.0.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -203,7 +201,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -226,7 +224,6 @@
 				AdditionalDependencies="setupapi.lib"
 				OutputFile="$(OutDir)\libusb-1.0_debug.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -283,7 +280,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -304,7 +301,6 @@
 				AdditionalDependencies="setupapi.lib"
 				OutputFile="$(OutDir)\libusb-1.0.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -358,42 +354,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\libusb\libusb-1.0.def"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath=".\libusb\sync.c"
 				>
 			</File>
diff --git a/libusb_dll_2008.vcproj b/libusb_dll_2008.vcproj
index 128c3a2..9e545a4 100644
--- a/libusb_dll_2008.vcproj
+++ b/libusb_dll_2008.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,6 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="setupapi.lib advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\libusb-1.0_debug.dll"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				EmbedManagedResourceFile="libusb-1.0.rc"
 				GenerateDebugInformation="true"
 			/>
@@ -117,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_WIN32;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -137,7 +136,6 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="setupapi.lib advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\libusb-1.0_debug.dll"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				EmbedManagedResourceFile="libusb-1.0.rc"
 				GenerateDebugInformation="true"
 			/>
@@ -191,7 +189,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -210,7 +208,6 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="setupapi.lib advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\libusb-1.0.dll"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				EmbedManagedResourceFile="libusb-1.0.rc"
 			/>
 			<Tool
@@ -264,7 +261,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".\msvc;.\libusb"
-				PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;LIBUSB_DLL_BUILD"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -283,7 +280,6 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="setupapi.lib advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\libusb-1.0.dll"
-				ModuleDefinitionFile="libusb\libusb-1.0.def"
 				EmbedManagedResourceFile="libusb-1.0.rc"
 			/>
 			<Tool
@@ -380,10 +376,6 @@
 			Name="Resource Files"
 			>
 			<File
-				RelativePath=".\libusb\libusb-1.0.def"
-				>
-			</File>
-			<File
 				RelativePath=".\libusb\libusb-1.0.rc"
 				>
 			</File>