Revision 1479

trunk/src/GNUmakefile (revision 1479)
110 110

  
111 111
shared: all
112 112
ifeq ($(SHELL),cmd)
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
113
	$(CXX) -static -shared $(LDFLAGS) -o..\build\dist\lib\admb.dll -Wl,--whole-archive ..\build\dist\lib\libadmb.a -Wl,--no-whole-archive
114
	$(CXX) -static -shared $(LDFLAGS) -o..\build\dist\lib\admbo.dll -Wl,--whole-archive ..\build\dist\lib\libadmbo.a -Wl,--no-whole-archive
115 115
else
116
	$(CXX) -shared -o../build/dist/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
117
	$(CXX) -shared -o../build/dist/lib/libadmb.so ../build/objects/dist/saflp-*.obj
116
  ifeq ($(CXX),c++)
117
	$(CXX) -shared -o../build/dist/lib/libadmb.so -Wl,-force_load ../build/dist/lib/libadmb.a
118
	$(CXX) -shared -o../build/dist/lib/libadmbo.so -Wl,-force_load ../build/dist/lib/libadmbo.a
119
  else
120
	$(CXX) -shared -o../build/dist/lib/libadmb.so -Wl,--whole-archive ../build/dist/lib/libadmb.a -Wl,--no-whole-archive
121
	$(CXX) -shared -o../build/dist/lib/libadmbo.so -Wl,--whole-archive ../build/dist/lib/libadmbo.a -Wl,--no-whole-archive
122
  endif
118 123
endif
119 124
	@echo ADMB shared build completed.
120 125
	@echo Check README.txt for usage and installation information.
trunk/contrib/GNUmakefile (revision 1479)
33 33

  
34 34
shared: all
35 35
ifeq ($(SHELL),cmd)
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
36
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contrib.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontrib.a -Wl,--no-whole-archive ..\build\dist\lib\admb.dll
37
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contribo.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontribo.a -Wl,--no-whole-archive ..\build\dist\lib\admbo.dll
38 38
else
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
39
  ifeq ($(CXX),c++)
40
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontrib.so -Wl,-force_load ../build/dist/contrib/lib/libcontrib.a ../build/dist/lib/libadmb.so
41
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontribo.so -Wl,-force_load ../build/dist/contrib/lib/libcontribo.a ../build/dist/lib/libadmbo.so
42
  else
43
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontrib.so -Wl,--whole-archive ../build/dist/contrib/lib/libcontrib.a -Wl,--no-whole-archive ../build/dist/lib/libadmb.so
44
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontribo.so -Wl,--whole-archive ../build/dist/contrib/lib/libcontribo.a -Wl,--no-whole-archive ../build/dist/lib/libadmbo.so
45
  endif
41 46
endif
42 47
	@echo ADMB contrib shared build completed.
43 48

  

Also available in: Unified diff