Revision 1474

trunk/src/GNUmakefile (revision 1474)
119 119
	cd ..\build\objects\dist & $(CXX) -static -shared -o ..\..\dist\lib\admbo.dll optlp-*.obj
120 120
	cd ..\build\objects\dist & $(CXX) -static -shared -o ..\..\dist\lib\admb.dll saflp-*.obj
121 121
else
122
	cd ../build/objects/dist & $(CXX) -shared -o/lib/libadmbo.so optlp-*.obj
123
	cd ../build/objects/dist & $(CXX) -shared -o$(DIST)/lib/libadmb.so saflp-*.obj
122
	$(CXX) -shared -o../build/dist/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
123
	$(CXX) -shared -o../build/dist/lib/libadmb.so ../build/objects/dist/saflp-*.obj
124 124
endif
125 125
	@echo ADMB shared build completed.
126 126
	@echo Check README.txt for usage and installation information.
trunk/contrib/GNUmakefile (revision 1474)
33 33

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

  

Also available in: Unified diff