summaryrefslogtreecommitdiff
path: root/setup_native/source/win32
diff options
context:
space:
mode:
Diffstat (limited to 'setup_native/source/win32')
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk8
-rwxr-xr-xsetup_native/source/win32/customactions/patch/makefile.mk8
-rw-r--r--setup_native/source/win32/customactions/quickstarter/makefile.mk8
-rw-r--r--setup_native/source/win32/customactions/rebase/makefile.mk8
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk7
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/makefile.mk7
-rw-r--r--setup_native/source/win32/customactions/reg64/makefile.mk4
-rw-r--r--setup_native/source/win32/customactions/relnotes/makefile.mk7
-rw-r--r--setup_native/source/win32/customactions/sellang/makefile.mk3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/makefile.mk8
-rw-r--r--setup_native/source/win32/customactions/tools/makefile.mk8
11 files changed, 1 insertions, 75 deletions
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index cf703e033c8e..365772ca8cd3 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -39,10 +39,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -61,10 +57,6 @@ STDSHL+= \
$(MSILIB) \
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1OBJS = $(SLOFILES) \
$(SLO)$/seterror.obj
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 3abd9988b486..77cd11e0322c 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -38,10 +38,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -59,10 +55,6 @@ STDSHL += \
$(MSILIB)\
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 0861c20efed8..870571578697 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -41,10 +41,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
UWINAPILIB=
# --- Files --------------------------------------------------------
@@ -56,10 +52,6 @@ STDSHL += \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk
index 47cd8fd59c87..cb9e29db1e60 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -40,10 +40,6 @@ MINGW_NODLL=YES
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
UWINAPILIB=
# --- Files --------------------------------------------------------
@@ -55,10 +51,6 @@ STDSHL += \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index d58291966ef2..24037f0c0c5b 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -39,9 +39,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DUNICODE -D_UNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
# --- Files --------------------------------------------------------
@@ -58,10 +55,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\
$(MSILIB)\
$(SHLWAPILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-SHL1STDLIBS+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
index fe2bf60949be..47239713ec1e 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -40,9 +40,6 @@ MINGW_NODLL=YES
.INCLUDE : settings.mk
CFLAGS+=-DUNICODE -D_UNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
# --- Files --------------------------------------------------------
@@ -71,10 +68,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\
$(MSILIB)\
$(SHLWAPILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-SHL1STDLIBS+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index 5e807cfbebb8..4cb5a5ca20d0 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -39,10 +39,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
index 4c29ead8bd6c..526d45e71393 100644
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ b/setup_native/source/win32/customactions/relnotes/makefile.mk
@@ -40,9 +40,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
CDEFS+=-DUNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CDEFS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
UWINAPILIB=
@@ -57,10 +54,6 @@ STDSHL+= \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk
index e2110ce708c9..a75c994fffc4 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -55,8 +55,7 @@ SHL1STDLIBS= kernel32.lib\
user32.lib\
advapi32.lib\
shell32.lib\
- msi.lib\
- $(LIBSTLPORTST)
+ msi.lib
SHL1LIBS = $(SLB)$/$(TARGET).lib
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 23fe24bb6ceb..de8f943320f0 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -38,10 +38,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -75,10 +71,6 @@ STDSHL += \
$(MSILIB)\
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index 9be7d7093da3..24e14861b968 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -39,10 +39,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
# --- Files --------------------------------------------------------
.IF "$(GUI)"=="WNT"
@@ -58,10 +54,6 @@ STDSHL+= \
$(ADVAPI32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1TARGET = $(TARGET)
SHL1IMPLIB = i$(TARGET)