diff options
| author | Mathias Michel <matm@gmx.fr> | 2012-11-19 01:07:53 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-19 09:29:52 +0000 |
| commit | 67fca36dbecaf0d35322f930d6462ab0d4ea56c5 (patch) | |
| tree | 595e0efea7a683c1c7810c4b5f86de141cd0dfa6 /moz | |
| parent | 30fa6e86a5bc4e8553f353ecbc17d4ae67874c9b (diff) | |
Better handling of well-know prerequisites under windows
Add moz prebuilt & msvcrt80 copy
Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5
Reviewed-on: https://gerrit.libreoffice.org/1100
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index f154b9512801..a30c87ec1dcb 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -32,7 +32,7 @@ TARGET=ooo_mozab # --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE : settings.mk # --- Files -------------------------------------------------------- @@ -66,7 +66,7 @@ SYSBASE_X11:=--x-includes=$(SYSBASE)/usr/include/X11 --x-libraries=$(SYSBASE)/us MOZ_ENABLE_COREXFONTS=1 MOZILLA_CONFIGURE_FLAGS +=--disable-xft .EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS -.ENDIF # "$(SYSBASE)"!="" && "$(OS)" == "LINUX" +.ENDIF # "$(SYSBASE)"!="" && "$(OS)" == "LINUX" # ----- pkg-config end ------- @@ -289,8 +289,15 @@ LIBIDL_PREFIX:=$(MOZ_TOOLS)/vc71 .IF "$(BUILD_MOZAB)"=="" all: - @echo "Never Build Mozilla." -.ENDIF + @echo "Never Build Mozilla but copy runtime files." + @@-$(MKDIR) $(OUT)$/zipped + $(COPY) $(MOZ_ZIP_INC) $(OUT)$/zipped$/ + $(COPY) $(MOZ_ZIP_LIB) $(OUT)$/zipped$/ + $(COPY) $(MOZ_ZIP_RUNTIME) $(OUT)$/zipped$/ + $(COPY) $(MSVC80_MNFST) $(EXTMSV80)$/Microsoft.VC80.CRT.manifest + $(COPY) $(MSVC80_DLL_DIR)$/msvcp80.dll $(EXTMSV80)$/ + $(COPY) $(MSVC80_DLL_DIR)$/msvcr80.dll $(EXTMSV80)$/ +.ENDIF .INCLUDE : set_ext.mk .INCLUDE : target.mk @@ -354,7 +361,7 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack .ENDIF .ENDIF # "$(GUI)"=="WNT" -zip: \ +zip: \ $(MISC)$/CREATETARBALL .IF "$(GUIBASE)"=="aqua" && "$(CREATE_UNIVERSAL_MAC_MOZ_ZIP)"!="" @@ -362,7 +369,7 @@ MOZ_ARCH=$(eq,$(CPU),I i386 ppc) MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8) force_clean : - @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) + @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL |