Revision 1481

trunk/contrib/GNUmakefile (revision 1481)
33 33

  
34 34
shared: all
35 35
ifeq ($(SHELL),cmd)
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
36
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contrib.dll ..\build\dist\lib\admb.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontrib.a -Wl,--no-whole-archive
37
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contribo.dll ..\build\dist\lib\admbo.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontribo.a -Wl,--no-whole-archive
38 38
else
39 39
  ifeq (LLVM,$(findstring LLVM,$(shell $(CXX) --version)))
40 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
......
55 55

  
56 56
contrib-libs: contrib-ecolib contrib-gdbprintlib contrib-qfclib contrib-statslib contrib-src
57 57
ifeq ($(SHELL),cmd)
58
	if exist  src\$(CONTRIB_LIB)\libcontrib.a del src\$(CONTRIB_LIB)\libcontrib.a
58 59
	$(AR) -rs src\$(CONTRIB_LIB)\libcontrib.a src\$(CONTRIB_OBJS_DIR)\saflp-contrib-*.obj
60
	if exist  src\$(CONTRIB_LIB)\libcontribo.a del src\$(CONTRIB_LIB)\libcontribo.a
59 61
	$(AR) -rs src\$(CONTRIB_LIB)\libcontribo.a src\$(CONTRIB_OBJS_DIR)\optlp-contrib-*.obj
60 62
else
63
	rm -vf src/$(CONTRIB_LIB)/libcontrib.a
61 64
	$(AR) -rs src/$(CONTRIB_LIB)/libcontrib.a src/$(CONTRIB_OBJS_DIR)/saflp-contrib-*.obj
65
	rm -vf src/$(CONTRIB_LIB)/libcontribo.a
62 66
	$(AR) -rs src/$(CONTRIB_LIB)/libcontribo.a src/$(CONTRIB_OBJS_DIR)/optlp-contrib-*.obj
63 67
endif
64 68

  

Also available in: Unified diff