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

Merge branch 'master' of oss.readytalk.com:/var/local/git/avian

Browse Source
This commit is contained in:
jet 2009-09-01 09:05:54 -06:00
commit abd4f6aeef
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
makefile
View File

@ -1,4 +1,4 @@
MAKEFLAGS = -s #MAKEFLAGS = -s
name = avian name = avian
version = 0.2 version = 0.2
@ -252,17 +252,18 @@ ifdef 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"
mt = "mt.exe"
cflags = -nologo -DAVIAN_VERSION=\"$(version)\" -D_JNI_IMPLEMENTATION_ \ cflags = -nologo -DAVIAN_VERSION=\"$(version)\" -D_JNI_IMPLEMENTATION_ \
-Fd$(native-build)/$(name).pdb -I"$(zlib)/include" -I$(src) \ -Fd$(native-build)/$(name).pdb -I"$(zlib)/include" -I$(src) \
-I"$(native-build)" -I"$(windows-java-home)/include" \ -I"$(native-build)" -I"$(windows-java-home)/include" \
-I"$(windows-java-home)/include/win32" -I"$(windows-java-home)/include/win32"
shared = -dll shared = -dll
lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \ lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \
-DEFAULTLIB:zlib -DEFAULTLIB:zlib -MANIFEST
output = -Fo$(1) output = -Fo$(1)
ifeq ($(mode),debug) ifeq ($(mode),debug)
cflags += -Od -Zi cflags += -Od -Zi -MDd
lflags += -debug lflags += -debug
endif endif
ifeq ($(mode),debug-fast) ifeq ($(mode),debug-fast)
@ -661,7 +662,9 @@ $(executable): \
@echo "linking $(@)" @echo "linking $(@)"
ifeq ($(platform),windows) ifeq ($(platform),windows)
ifdef msvc ifdef msvc
$(ld) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib $(ld) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib \
-MANIFESTFILE:$(@).manifest
$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
else else
$(dlltool) -z $(@).def $(^) $(call gnu-objects) $(dlltool) -z $(@).def $(^) $(call gnu-objects)
$(dlltool) -d $(@).def -e $(@).exp $(dlltool) -d $(@).def -e $(@).exp
@ -692,7 +695,9 @@ $(build-bootimage-generator): \
@echo "linking $(@)" @echo "linking $(@)"
ifeq ($(platform),windows) ifeq ($(platform),windows)
ifdef msvc ifdef msvc
$(ld) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib $(ld) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib \
-MANIFESTFILE:$(@).manifest
$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
else else
$(dlltool) -z $(@).def $(^) $(dlltool) -z $(@).def $(^)
$(dlltool) -d $(@).def -e $(@).exp $(dlltool) -d $(@).def -e $(@).exp
@ -709,7 +714,8 @@ $(dynamic-library): \
@echo "linking $(@)" @echo "linking $(@)"
ifdef msvc ifdef msvc
$(ld) $(shared) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb \ $(ld) $(shared) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb \
-IMPLIB:$(native-build)/$(name).lib -IMPLIB:$(native-build)/$(name).lib -MANIFESTFILE:$(@).manifest
$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
else else
$(ld) $(^) $(call gnu-objects) $(shared) $(lflags) $(bootimage-lflags) \ $(ld) $(^) $(call gnu-objects) $(shared) $(lflags) $(bootimage-lflags) \
-o $(@) -o $(@)
@ -720,7 +726,8 @@ $(executable-dynamic): $(driver-dynamic-object) $(dynamic-library)
@echo "linking $(@)" @echo "linking $(@)"
ifdef msvc ifdef msvc
$(ld) $(lflags) -LIBPATH:$(native-build) -DEFAULTLIB:$(name) \ $(ld) $(lflags) -LIBPATH:$(native-build) -DEFAULTLIB:$(name) \
-PDB:$(@).pdb -IMPLIB:$(@).lib $(<) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib $(<) -out:$(@) -MANIFESTFILE:$(@).manifest
$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
else else
$(ld) $(^) $(lflags) -o $(@) $(ld) $(^) $(lflags) -o $(@)
endif endif