diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2009-10-27 16:45:40 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2009-10-27 16:45:40 +0000 |
| commit | 8a0d1b11477b9bc647cc4d490cfdf2828be3071c (patch) | |
| tree | f9f15eaf413d60c8a34292fc57d6111ca5f98e6a /desktop/util | |
| parent | 3efb06e835112a82bb38d3687b28fd20450a6471 (diff) | |
#i10000# separate SO build for windows
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 12cde0b8649c..4dec3cd738ba 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -209,6 +209,7 @@ APP5LINKRES=$(MISC)$/ooffice.res .ENDIF # OS2 .IF "$(GUI)" == "WNT" +.IF "$(LINK_SO)"=="TRUE" APP6TARGET=so$/officeloader APP6RES=$(RES)$/soloader.res APP6NOSAL=TRUE @@ -221,6 +222,7 @@ APP6OBJS = \ $(OBJ)$/officeloader.obj \ $(SOLARLIBDIR)$/pathutils-obj.obj STDLIB6=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB) +.ENDIF # "$(LINK_SO)"=="TRUE" APP7TARGET=officeloader APP7RES=$(RES)$/ooloader.res @@ -268,7 +270,9 @@ $(APP6TARGETN) : $(MISC)$/binso_created.flg ALLTAR: $(MISC)$/$(TARGET).exe.manifest ALLTAR: $(MISC)$/$(TARGET).bin.manifest ALLTAR: $(BIN)$/$(TARGET).bin +.IF "$(LINK_SO)"=="TRUE" ALLTAR: $(BIN)$/so$/$(TARGET).bin +.ENDIF # "$(LINK_SO)"=="TRUE" .ENDIF # WNT .IF "$(GUI)" == "OS2" @@ -279,11 +283,14 @@ $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) $(COPY) $< $@ .IF "$(GUI)" != "OS2" +.IF "$(LINK_SO)"=="TRUE" $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) - +.ELSE +ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) +.ENDIF # "$(LINK_SO)"=="TRUE" .ENDIF .IF "$(OS)" == "MACOSX" |