diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 14:58:37 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-22 09:06:20 +0300 |
commit | 0dff25f128a49e5502c8c665f3356364903558ad (patch) | |
tree | fb71b1a6e12c3ee773c8d12aff444a24ca8efb58 /setup_native | |
parent | abfe27cf6b15cec394471b41a742ffb49e46bf1d (diff) |
Bypass these if we don't have the Windows SDK
I.e. mainly when cross-compiling with MinGW. We can't build an MSI
installer when cross-compiling anyway, so that we can't build the
installer custom actions is fairly irrelevant.
Diffstat (limited to 'setup_native')
13 files changed, 29 insertions, 39 deletions
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk index 3ee19cff53b4..3039ef4ccabd 100644 --- a/setup_native/source/win32/customactions/javafilter/makefile.mk +++ b/setup_native/source/win32/customactions/javafilter/makefile.mk @@ -40,7 +40,7 @@ DYNAMIC_CRT= # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= @@ -62,9 +62,9 @@ DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp .ENDIF + # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk index 365772ca8cd3..94eab3a0109c 100644 --- a/setup_native/source/win32/customactions/languagepacks/makefile.mk +++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk @@ -44,7 +44,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk index 77cd11e0322c..641f48ab6e27 100755 --- a/setup_native/source/win32/customactions/patch/makefile.mk +++ b/setup_native/source/win32/customactions/patch/makefile.mk @@ -43,7 +43,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= @@ -86,4 +86,3 @@ DEF1EXPORTFILE=exports.dxp .INCLUDE : target.mk # ------------------------------------------------------------------------- - diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk index 870571578697..57b53d262ac7 100644 --- a/setup_native/source/win32/customactions/quickstarter/makefile.mk +++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk @@ -45,7 +45,7 @@ UWINAPILIB= # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" STDSHL += \ $(ADVAPI32LIB)\ @@ -91,4 +91,3 @@ DEF2EXPORTFILE=$(TARGET2).dxp .INCLUDE : target.mk # ------------------------------------------------------------------------- - diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk index cb9e29db1e60..fb1fc22a8555 100644 --- a/setup_native/source/win32/customactions/rebase/makefile.mk +++ b/setup_native/source/win32/customactions/rebase/makefile.mk @@ -44,7 +44,7 @@ UWINAPILIB= # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" STDSHL += \ $(ADVAPI32LIB)\ diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk index 24037f0c0c5b..0f162fa6cd9a 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk +++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk @@ -42,7 +42,7 @@ CFLAGS+=-DUNICODE -D_UNICODE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk index 023aee50e664..a0d7fbaefc1f 100644 --- a/setup_native/source/win32/customactions/reg64/makefile.mk +++ b/setup_native/source/win32/customactions/reg64/makefile.mk @@ -44,7 +44,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk index cc71dc39ada1..22eb1c89f7cd 100644 --- a/setup_native/source/win32/customactions/regactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regactivex/makefile.mk @@ -40,7 +40,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= @@ -67,4 +67,3 @@ DEF1EXPORTFILE=exports.dxp .INCLUDE : target.mk # ------------------------------------------------------------------------- - diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk index 4c6668db268c..9641c8ba018c 100644 --- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk @@ -30,14 +30,14 @@ PRJNAME=setup_native TARGET=regpatchactivex USE_DEFFILE=TRUE -.IF "$(GUI)"=="WNT" - # --- Settings ----------------------------------------------------- ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" + STDSHL= # --- Files -------------------------------------------------------- @@ -78,12 +78,10 @@ SHL1BASE = 0x1c000000 DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.ENDIF + # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - - -.ENDIF - diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk index a75c994fffc4..ffad814e3d74 100644 --- a/setup_native/source/win32/customactions/sellang/makefile.mk +++ b/setup_native/source/win32/customactions/sellang/makefile.mk @@ -31,8 +31,6 @@ PRJ=..$/..$/..$/.. PRJNAME=setup_native TARGET=sellangmsi -.IF "$(GUI)"=="WNT" - # --- Settings ----------------------------------------------------- ENABLE_EXCEPTIONS=TRUE @@ -42,6 +40,8 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" + CFLAGS+=-D_STLP_USE_STATIC_LIB # --- Files -------------------------------------------------------- @@ -51,11 +51,12 @@ UWINAPILIB= SLOFILES = \ $(SLO)$/sellang.obj -SHL1STDLIBS= kernel32.lib\ - user32.lib\ - advapi32.lib\ - shell32.lib\ - msi.lib +SHL1STDLIBS= \ + $(KERNEL32LIB)\ + $(USER32LIB)\ + $(ADVAPI32LIB)\ + $(SHELL32LIB)\ + $(MSILIB) SHL1LIBS = $(SLB)$/$(TARGET).lib @@ -68,11 +69,10 @@ SHL1BASE = 0x1c000000 DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.ENDIF + # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - - -.ENDIF diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index de8f943320f0..e0950d992dc2 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -43,7 +43,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= @@ -96,5 +96,3 @@ DEF1EXPORTFILE=exports.dxp .INCLUDE : target.mk # ------------------------------------------------------------------------- - - diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk index c353341bf353..3041f87598ac 100755 --- a/setup_native/source/win32/customactions/thesaurus/makefile.mk +++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk @@ -31,8 +31,6 @@ PRJ=..$/..$/..$/.. PRJNAME=setup_native TARGET=thidxmsi -.IF "$(GUI)"=="WNT" - # --- Settings ----------------------------------------------------- ENABLE_EXCEPTIONS=TRUE @@ -42,6 +40,8 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" + CFLAGS+=-D_STLP_USE_STATIC_LIB # --- Files -------------------------------------------------------- @@ -68,11 +68,10 @@ SHL1BASE = 0x1c000000 DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.ENDIF + # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - - -.ENDIF diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk index 24e14861b968..61c58036b9a8 100644 --- a/setup_native/source/win32/customactions/tools/makefile.mk +++ b/setup_native/source/win32/customactions/tools/makefile.mk @@ -41,7 +41,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= @@ -70,5 +70,3 @@ DEF1EXPORTFILE=exports.dxp .INCLUDE : target.mk # ------------------------------------------------------------------------- - - |