Revision 1472

trunk/contrib/GNUmakefile (revision 1472)
29 29
	$(MAKE) contrib-includes
30 30
	$(MAKE) contrib-libs
31 31
	$(MAKE) contrib-ad2csv
32
	@echo ADMB contrib build completed.
32 33

  
34
shared: all
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
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
41
endif
42
	@echo ADMB contrib shared build completed.
43

  
33 44
contrib-includes: contrib-dirs
34 45
	@$(MAKE) --directory=ecolib CONTRIB_INCLUDE=$(CONTRIB_INCLUDE) includes
35 46
	@$(MAKE) --directory=gdbprintlib CONTRIB_INCLUDE=$(CONTRIB_INCLUDE) includes
trunk/contrib/Makefile (revision 1472)
4 4
	$(MAKE) contrib-includes
5 5
	$(MAKE) contrib-libs
6 6
	$(MAKE) contrib-ad2csv
7
	@echo ADMB contrib build completed.
8
	
9
shared: all
10
	IF EXIST $(DESTDIR)\contrib\lib\contrib.dll del $(DESTDIR)\contrib\lib\contrib.dll
11
	link /DLL /OUT:$(DESTDIR)\contrib\lib\contrib.dll /NOLOGO /IGNORE:4006 $(OBJDESTDIR)\saflp-contrib*.obj $(DESTDIR)\lib\admb.lib
12
	IF EXIST $(DESTDIR)\contrib\lib\contribo.dll del $(DESTDIR)\contrib\lib\contribo.dll
13
	link /DLL /OUT:$(DESTDIR)\contrib\lib\contribo.dll /NOLOGO /IGNORE:4006 $(OBJDESTDIR)\optlp-contrib*.obj $(DESTDIR)\lib\admbo.lib
14
	@echo ADMB contrib shared build completed.
7 15

  
8 16
contrib-includes: contrib-dirs
9 17
	cd ecolib& $(MAKE) CONTRIB_INCLUDE=..\$(DESTDIR)\contrib\include includes
trunk/CHANGES.txt (revision 1472)
42 42

  
43 43
        $ admb -f model.tpl
44 44

  
45
* Fix shared (libadmb.so) and dynamic (admb.dll) builds.
46

  
47
        [~/admb/]$ make shared
48

  
49
        C:\admb\> utilities\make shared
50

  
51
  Note — This is great for testing linker errors.
52

  
53

  
45 54
####New Supported Compilers
46 55

  
47 56
* GNU C++ 4.8 compiler
trunk/src/Makefile (revision 1472)
33 33
	@echo ADMB build completed.
34 34
	@echo Check README.txt for usage and installation information.
35 35

  
36
shared: all
37
	IF EXIST $(DESTDIR)\lib\admb.dll del $(DESTDIR)\lib\admb.dll
38
	pushd $(OBJDESTDIR) & link /DLL /OUT:..\..\$(DESTDIR)\lib\admb.dll /NOLOGO /IGNORE:4006 saflp-df1b2-separable*.obj saflp-linad99*.obj saflp-nh99*.obj saflp-tools99*.obj saflp-sparse*.obj
39
	IF EXIST $(DESTDIR)\lib\admbo.dll del $(DESTDIR)\lib\admbo.dll
40
	pushd $(OBJDESTDIR) & link /DLL /OUT:..\..\$(DESTDIR)\lib\admbo.dll /NOLOGO /IGNORE:4006 optlp-df1b2-separable*.obj optlp-linad99*.obj optlp-nh99*.obj optlp-tools99*.obj optlp-sparse*.obj
41
	@echo ADMB shared build completed.
42

  
36 43
dist: bins
37 44
	IF NOT EXIST $(DESTDIR) md $(DESTDIR)
38 45
	copy ..\LICENSE.txt $(DESTDIR)
trunk/src/GNUmakefile (revision 1472)
114 114
	@echo ADMB build completed.
115 115
	@echo Check README.txt for usage and installation information.
116 116

  
117
shared: objects
118
	$(CXX) -shared -o${DIST}/lib/libadmb.so ../build/objects/dist/saflp-*.obj
119
	$(CXX) -shared -o${DIST}/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
117
shared: all
118
ifeq ($(SHELL),cmd)
119
	$(CXX) -static -shared -o $(DIST)\lib\admbo.dll $(DIST)\lib\libadmbo.a
120
	$(CXX) -static -shared -o $(DIST)\lib\admb.dll $(DIST)\lib\libadmb.a
121
else
122
	$(CXX) -shared -o$(DIST)/lib/libadmbo.so $(DIST)/lib/libadmbo.a
123
	$(CXX) -shared -o$(DIST)/lib/libadmb.so $(DIST)/lib/libadmb.a
124
endif
120 125
	@echo ADMB shared build completed.
121 126
	@echo Check README.txt for usage and installation information.
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff