Revision 1478

trunk/contrib/GNUmakefile (revision 1478)
33 33

  
34 34
shared: all
35 35
ifeq ($(SHELL),cmd)
36
	pushd ..\build\objects\contrib & $(CXX) -static -shared -o ..\..\dist\contrib\lib\contrib.dll saflp-*.obj ..\..\dist\lib\admb.dll
37
	pushd ..\build\objects\contrib & $(CXX) -static -shared -o ..\..\dist\contrib\lib\contribo.dll optlp-*.obj ..\..\dist\lib\admbo.dll
36
	pushd ..\build\objects\contrib & $(CXX) -static -shared $(LDFLAGS) -o ..\..\dist\contrib\lib\contrib.dll saflp-*.obj ..\..\dist\lib\admb.dll
37
	pushd ..\build\objects\contrib & $(CXX) -static -shared $(LDFLAGS) -o ..\..\dist\contrib\lib\contribo.dll optlp-*.obj ..\..\dist\lib\admbo.dll
38 38
else
39
	$(CXX) -shared -o../build/dist/contrib/lib/libcontrib.so ../build/objects/contrib/saflp-*.obj ../build/dist/lib/libadmb.so
40
	$(CXX) -shared -o../build/dist/contrib/lib/libcontribo.so ../build/objects/contrib/optlp-*.obj ../build/dist/lib/libadmbo.so
39
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontrib.so ../build/objects/contrib/saflp-*.obj ../build/dist/lib/libadmb.so
40
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontribo.so ../build/objects/contrib/optlp-*.obj ../build/dist/lib/libadmbo.so
41 41
endif
42 42
	@echo ADMB contrib shared build completed.
43 43

  
trunk/src/GNUmakefile (revision 1478)
110 110

  
111 111
shared: all
112 112
ifeq ($(SHELL),cmd)
113
	pushd ..\build\objects\dist & $(CXX) -static -shared -o..\..\dist\lib\admbo.dll optlp-*.obj
114
	pushd ..\build\objects\dist & $(CXX) -static -shared -o..\..\dist\lib\admb.dll saflp-*.obj
113
	pushd ..\build\objects\dist & $(CXX) -static -shared $(LDFLAGS) -o..\..\dist\lib\admbo.dll optlp-*.obj
114
	pushd ..\build\objects\dist & $(CXX) -static -shared $(LDFLAGS) -o..\..\dist\lib\admb.dll saflp-*.obj
115 115
else
116 116
	$(CXX) -shared -o../build/dist/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
117 117
	$(CXX) -shared -o../build/dist/lib/libadmb.so ../build/objects/dist/saflp-*.obj

Also available in: Unified diff