ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updates to .gitignore to get rid of any possibility of checking in binaries in lib/distrib directories, and generalized method of setting location of win32 and win64 libs.

Browse Source
This commit is contained in:
Seth Goings 2012-02-20 16:25:37 -07:00
parent a254d20e0e
commit e849d8f9c9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ build
.project .project
.settings .settings
bin bin
/lib
/distrib

12
makefile
View File

@ -51,6 +51,8 @@ test-build = $(build)/test
src = src src = src
classpath-src = classpath classpath-src = classpath
test = test test = test
win32 ?= $(root)/win32
win64 ?= $(root)/win64
classpath = avian classpath = avian
@ -361,8 +363,8 @@ endif
ifeq ($(platform),windows) ifeq ($(platform),windows)
bootimage-cflags += -DTARGET_PLATFORM_WINDOWS bootimage-cflags += -DTARGET_PLATFORM_WINDOWS
inc = "$(root)/win32/include" inc = "$(win32)/include"
lib = "$(root)/win32/lib" lib = "$(win32)/lib"
embed-prefix = c:/avian-embedded embed-prefix = c:/avian-embedded
@ -411,8 +413,8 @@ ifeq ($(platform),windows)
ar = x86_64-w64-mingw32-ar ar = x86_64-w64-mingw32-ar
ranlib = x86_64-w64-mingw32-ranlib ranlib = x86_64-w64-mingw32-ranlib
strip = x86_64-w64-mingw32-strip strip = x86_64-w64-mingw32-strip
inc = "$(root)/win64/include" inc = "$(win64)/include"
lib = "$(root)/win64/lib" lib = "$(win64)/lib"
endif endif
endif endif
@ -469,7 +471,7 @@ build-ld := $(build-cc)
ifdef msvc ifdef msvc
windows-java-home := $(shell cygpath -m "$(JAVA_HOME)") windows-java-home := $(shell cygpath -m "$(JAVA_HOME)")
zlib := $(shell cygpath -m "$(root)/win32/msvc") zlib := $(shell cygpath -m "$(win32)/msvc")
cxx = "$(msvc)/BIN/cl.exe" cxx = "$(msvc)/BIN/cl.exe"
cc = $(cxx) cc = $(cxx)
ld = "$(msvc)/BIN/link.exe" ld = "$(msvc)/BIN/link.exe"