diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-03-06 00:37:21 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-03-06 00:37:21 +0000 |
| commit | 858b13ab77b65c8bce26c8fb4804767507b394fa (patch) | |
| tree | 3e4ee509ad06ffb12c10db331db9e0ec1e2ce06d | |
| parent | 4ef54da3181b2d934ab4ed1bd69b8124050e5e78 (diff) | |
| download | libusb-858b13ab77b65c8bce26c8fb4804767507b394fa.tar.gz | |
moved libusb-1.0.rc to libusb/ (where the .def is located)
| -rw-r--r-- | ddk_build.cmd | 3 | ||||
| -rw-r--r-- | libusb-dll_2005.vcproj | 2 | ||||
| -rw-r--r-- | libusb-dll_2008.vcproj | 2 | ||||
| -rw-r--r-- | libusb/Makefile.am | 2 | ||||
| -rw-r--r-- | libusb/libusb-1.0.rc (renamed from msvc/libusb-1.0.rc) | 0 | ||||
| -rw-r--r-- | libusb_dll.dsp | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/ddk_build.cmd b/ddk_build.cmd index e51d939..236c589 100644 --- a/ddk_build.cmd +++ b/ddk_build.cmd @@ -4,12 +4,10 @@ if Test%BUILD_ALT_DIR%==Test goto usage set version=1.0 cd libusb\os -copy /y ..\..\msvc\libusb-%version%.rc . @echo on build -cZ @echo off if errorlevel 1 goto builderror -del libusb-%version%.rc cd ..\.. set cpudir=i386 @@ -94,7 +92,6 @@ goto done :builderror -del libusb-%version%.rc cd ..\.. echo Build failed goto done diff --git a/libusb-dll_2005.vcproj b/libusb-dll_2005.vcproj index 09271b3..0079cbd 100644 --- a/libusb-dll_2005.vcproj +++ b/libusb-dll_2005.vcproj @@ -447,7 +447,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > <File - RelativePath=".\msvc\libusb-1.0.rc" + RelativePath=".\libusb\libusb-1.0.rc" > </File> </Filter> diff --git a/libusb-dll_2008.vcproj b/libusb-dll_2008.vcproj index a31fdee..85fa353 100644 --- a/libusb-dll_2008.vcproj +++ b/libusb-dll_2008.vcproj @@ -388,7 +388,7 @@ > </File> <File - RelativePath=".\msvc\libusb-1.0.rc" + RelativePath=".\libusb\libusb-1.0.rc" > </File> </Filter> diff --git a/libusb/Makefile.am b/libusb/Makefile.am index 6152daa..48b28fb 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -8,7 +8,7 @@ endif LINUX_USBFS_SRC = $(THREADS_SRC) os/poll_posix.h os/linux_usbfs.h os/linux_usbfs.c DARWIN_USB_SRC = $(THREADS_SRC) os/poll_posix.h os/darwin_usb.h os/darwin_usb.c -WINDOWS_USB_SRC = $(THREADS_SRC) os/poll_windows.h os/poll_windows.c os/windows_usb.h os/windows_usb.c ../msvc/libusb-1.0.rc +WINDOWS_USB_SRC = $(THREADS_SRC) os/poll_windows.h os/poll_windows.c os/windows_usb.h os/windows_usb.c libusb-1.0.rc EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(WINDOWS_USB_SRC) diff --git a/msvc/libusb-1.0.rc b/libusb/libusb-1.0.rc index 5dea80c..5dea80c 100644 --- a/msvc/libusb-1.0.rc +++ b/libusb/libusb-1.0.rc diff --git a/libusb_dll.dsp b/libusb_dll.dsp index 2c180c3..e937eff 100644 --- a/libusb_dll.dsp +++ b/libusb_dll.dsp @@ -114,7 +114,7 @@ SOURCE=".\libusb\libusb-1.0.def" # End Source File # Begin Source File -SOURCE=".\msvc\libusb-1.0.rc" +SOURCE=".\libusb\libusb-1.0.rc" # End Source File # Begin Source File |