Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix meta windows compile

This commit is contained in:
Wilfried Goesgens 2016-05-24 13:47:49 +02:00
parent e2d20470d9
commit 4632e24d61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GNUmakefile
View File

@ -247,23 +247,23 @@ pack-deb-cmake:
.PHONY: pack-win32 pack-winXX winXX-cmake win64-relative win64-relative-debug .PHONY: pack-win32 pack-winXX winXX-cmake win64-relative win64-relative-debug
pack-win32: pack-win32:
$(MAKE) pack-winXX BITS=32 TARGET="Visual Studio 12" $(MAKE) pack-winXX BITS=32 TARGET="Visual Studio 14"
pack-win64: pack-win64:
$(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 12 Win64" $(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 14 Win64"
pack-win32-relative: pack-win32-relative:
$(MAKE) pack-winXX BITS=32 TARGET="Visual Studio 12" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"' $(MAKE) pack-winXX BITS=32 TARGET="Visual Studio 14" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
pack-win64-relative: pack-win64-relative:
$(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"' $(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 14 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
win64-relative: win64-relative:
$(MAKE) winXX-cmake BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON"' $(MAKE) winXX-cmake BITS=64 TARGET="Visual Studio 14 Win64" MOREOPTS='-D "USE_RELATIVE=ON"'
$(MAKE) winXX-build BITS=64 BUILD_TARGET=RelWithDebInfo $(MAKE) winXX-build BITS=64 BUILD_TARGET=RelWithDebInfo
win64-relative-debug: win64-relative-debug:
$(MAKE) winXX-cmake BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"' $(MAKE) winXX-cmake BITS=64 TARGET="Visual Studio 14 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
$(MAKE) winXX-build BITS=64 BUILD_TARGET=Debug $(MAKE) winXX-build BITS=64 BUILD_TARGET=Debug
pack-winXX: pack-winXX:
@ -291,7 +291,7 @@ winXX-cmake: checkcmake
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=4.11" \ -D "LIBEV_VERSION=4.11" \
-D "V8_VERSION=4.3.61" \ -D "V8_VERSION=V8-5.0.71.39" \
-D "ZLIB_VERSION=1.2.7" \ -D "ZLIB_VERSION=1.2.7" \
-D "BUILD_ID=${BUILD_ID}" \ -D "BUILD_ID=${BUILD_ID}" \
$(MOREOPTS) \ $(MOREOPTS) \