summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pbatard@gmail.com>2011-02-25 12:49:19 +0000
committerPete Batard <pbatard@gmail.com>2011-02-25 12:49:19 +0000
commitac1dcba5e2971e76f399596de744d587023b1045 (patch)
tree349bcf7efc2ab0b5a9e2127c46188823909974a8
parentaefe4c8623db0676f81cfd1d611ae0a5a6e42da5 (diff)
downloadlibusb-ac1dcba5e2971e76f399596de744d587023b1045.tar.gz
[INTERNAL - NOT FOP RELEASE] libusb.h -> include/libusb-1.0
* suggested by Chris Johns * also copy the .def from MinGW to ensure regenerated one is used
-rw-r--r--_README.txt14
-rw-r--r--_bd.cmd2
-rw-r--r--_bm.sh8
3 files changed, 13 insertions, 11 deletions
diff --git a/_README.txt b/_README.txt
index fd9d809..00bf27f 100644
--- a/_README.txt
+++ b/_README.txt
@@ -7,9 +7,9 @@
o Visual Studio:
- Open existing or create a new project for your application
- - Copy the libusb.h into your project and make sure that the location where
- the file reside appears in the 'Additional Include Directories' section
- (Configuration Properties -> C/C++ -> General).
+ - Copy libusb.h, from the include\libusb-1.0\ directory, into your project and
+ make sure that the location where the file reside appears in the 'Additional
+ Include Directories' section (Configuration Properties -> C/C++ -> General).
- Copy the relevant .lib file from MS32\ or MS64\ and add 'libusb-1.0.lib' to
your 'Additional Dependencies' (Configuration Properties -> Linker -> Input)
Also make sure that the directory where libusb-1.0.lib resides is added to
@@ -43,10 +43,10 @@ o WDK/DDK:
easily be achieved, in the DDK environment, by running 'ddk_build /MT'
o MinGW/cygwin
- - Copy libusb.h to your default include directory and the relevant MinGW32\ or
- MinGW64\ .a file to your default library directory. Or, if you don't want to
- use the default locations, make sure that you feed the relevant -I and -L
- options to the compiler.
+ - Copy libusb.h, from include/libusb-1.0/ to your default include directory,
+ and copy the MinGW32/ or MinGW64/ .a files to your default library directory.
+ Or, if you don't want to use the default locations, make sure that you feed
+ the relevant -I and -L options to the compiler.
- Add the '-lusb-1.0' linker option when compiling.
o Additional information:
diff --git a/_bd.cmd b/_bd.cmd
index 7e148cd..1f4bbcb 100644
--- a/_bd.cmd
+++ b/_bd.cmd
@@ -9,8 +9,6 @@ for %%A in (MS32 MS64) do mkdir E:\dailies\%DATE%\%%A
for %%A in (MS32 MS64) do mkdir E:\dailies\%DATE%\%%A\static
for %%A in (MS32 MS64) do mkdir E:\dailies\%DATE%\%%A\dll
for %%A in (source bin32 bin64) do mkdir E:\dailies\%DATE%\examples\%%A
-copy libusb\libusb.h E:\dailies\%DATE%\
-copy libusb\libusb-1.0.def E:\dailies\%DATE%\
copy examples\lsusb.c E:\dailies\%DATE%\examples\source
copy examples\xusb.c E:\dailies\%DATE%\examples\source
copy msvc\stdint.h E:\dailies\%DATE%\examples\source
diff --git a/_bm.sh b/_bm.sh
index 346d58e..df10267 100644
--- a/_bm.sh
+++ b/_bm.sh
@@ -3,12 +3,16 @@
# !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!!
date=`date +%Y.%m.%d`
+target=e:/dailies/$date
+mkdir -p $target/include/libusb-1.0
+cp -v libusb/libusb-1.0.def $target
+cp -v libusb/libusb.h $target/include/libusb-1.0
#
# 32 bit binaries
#
target=e:/dailies/$date/MinGW32
-git clean -f -d -x
+git clean -fdx
# Not using debug (-g) in CFLAGS DRAMATICALLY reduces the size of the binaries
export CFLAGS="-O2 -m32"
export LDFLAGS="-m32"
@@ -44,4 +48,4 @@ mkdir -p $target/static
mkdir -p $target/dll
cp -v libusb/.libs/libusb-1.0.a $target/static
cp -v libusb/.libs/libusb-1.0.dll $target/dll
-cp -v libusb/.libs/libusb-1.0.dll.a $target/dll \ No newline at end of file
+cp -v libusb/.libs/libusb-1.0.dll.a $target/dll