Permalink
Browse files

Updates to .gitignore to get rid of any possibility of checking in bi…

…naries in lib/distrib directories, and generalized method of setting location of win32 and win64 libs.
  • Loading branch information...
1 parent a254d20 commit e849d8f9c928fbaea037aa89c436581b9c59e20b @sgoings sgoings committed Feb 20, 2012
Showing with 9 additions and 5 deletions.
  1. +2 −0 .gitignore
  2. +7 −5 makefile
View
2 .gitignore
@@ -5,3 +5,5 @@ build
.project
.settings
bin
+/lib
+/distrib
View
12 makefile
@@ -51,6 +51,8 @@ test-build = $(build)/test
src = src
classpath-src = classpath
test = test
+win32 ?= $(root)/win32
+win64 ?= $(root)/win64
classpath = avian
@@ -361,8 +363,8 @@ endif
ifeq ($(platform),windows)
bootimage-cflags += -DTARGET_PLATFORM_WINDOWS
- inc = "$(root)/win32/include"
- lib = "$(root)/win32/lib"
+ inc = "$(win32)/include"
+ lib = "$(win32)/lib"
embed-prefix = c:/avian-embedded
@@ -411,8 +413,8 @@ ifeq ($(platform),windows)
ar = x86_64-w64-mingw32-ar
ranlib = x86_64-w64-mingw32-ranlib
strip = x86_64-w64-mingw32-strip
- inc = "$(root)/win64/include"
- lib = "$(root)/win64/lib"
+ inc = "$(win64)/include"
+ lib = "$(win64)/lib"
endif
endif
@@ -469,7 +471,7 @@ build-ld := $(build-cc)
ifdef msvc
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"
cc = $(cxx)
ld = "$(msvc)/BIN/link.exe"

0 comments on commit e849d8f

Please sign in to comment.