File tree Expand file tree Collapse file tree 4 files changed +51
-1
lines changed
Expand file tree Collapse file tree 4 files changed +51
-1
lines changed Original file line number Diff line number Diff line change @@ -39,8 +39,12 @@ IF(MINGW)
3939 SET (_SUFFIX lib-mingw)
4040ELSEIF (MSVC11)
4141 SET (_SUFFIX lib-vc2012)
42- ELSEIF (MSVC )
42+ ELSEIF (MSVC12 )
4343 SET (_SUFFIX lib-vc2013)
44+ ELSEIF (MSVC14)
45+ SET (_SUFFIX lib-vc2015)
46+ ELSEIF (MSVC )
47+ SET (_SUFFIX lib-vc2012)
4448ENDIF ()
4549
4650FIND_LIBRARY (GLFW3_LIBRARIES
Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ FIND_PATH(LibUSB_INCLUDE_DIRS
3535 PATH_SUFFIXES
3636 include
3737 libusb
38+ include /libusb-1.0
3839)
3940
4041FIND_LIBRARY (LibUSB_LIBRARIES
@@ -49,6 +50,7 @@ FIND_LIBRARY(LibUSB_LIBRARIES
4950 Win32 /Release/dll
5051 Win32 /Debug/dll
5152 MS64
53+ MS64/dll
5254)
5355
5456INCLUDE (FindPackageHandleStandardArgs)
Original file line number Diff line number Diff line change 1+ rem This can only be run in a Git Shell or similar environments
2+ rem with access to git.exe and msbuild.exe.
3+
4+ rmdir /s /q libusb_src libusb
5+
6+ git clone https://github.com/libusb/libusb.git libusb_src || exit /b
7+ cd libusb_src
8+
9+ git remote add joshblake https://github.com/JoshBlake/libusbx.git
10+ git fetch joshblake || exit /b
11+ git merge joshblake/winiso
12+
13+ set CONFIG = Release
14+ msbuild msvc\libusb_dll_2013.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild
15+
16+ mkdir ..\libusb\include\libusb-1.0
17+ copy libusb\libusb.h ..\libusb\include\libusb-1.0
18+ mkdir ..\libusb\MS64\dll
19+ copy x64\%CONFIG% \dll\libusb-1.0.lib ..\libusb\MS64\dll
20+ copy x64\%CONFIG% \dll\libusb-1.0.dll ..\libusb\MS64\dll
21+ copy x64\%CONFIG% \dll\libusb-1.0.pdb ..\libusb\MS64\dll
Original file line number Diff line number Diff line change 1+ rem This can only be run in a Git Shell or similar environments
2+ rem with access to git.exe and msbuild.exe.
3+
4+ rmdir /s /q libusb_src libusb
5+
6+ git clone https://github.com/libusb/libusb.git libusb_src || exit /b
7+ cd libusb_src
8+
9+ git remote add joshblake https://github.com/JoshBlake/libusbx.git
10+ git fetch joshblake || exit /b
11+ git merge joshblake/winiso
12+ git fetch origin pull/83/head:pr83 || exit /b
13+ git merge pr83
14+
15+ set CONFIG = Release
16+ msbuild msvc\libusb_dll_2015.vcxproj /p:Platform=x64 /p:Configuration=%CONFIG% /target:Rebuild
17+
18+ mkdir ..\libusb\include\libusb-1.0
19+ copy libusb\libusb.h ..\libusb\include\libusb-1.0
20+ mkdir ..\libusb\MS64\dll
21+ copy x64\%CONFIG% \dll\libusb-1.0.lib ..\libusb\MS64\dll
22+ copy x64\%CONFIG% \dll\libusb-1.0.dll ..\libusb\MS64\dll
23+ copy x64\%CONFIG% \dll\libusb-1.0.pdb ..\libusb\MS64\dll
You can’t perform that action at this time.
0 commit comments