diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-01 17:26:38 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-01 18:21:17 +0100 |
| commit | 2945b56030e35d30825b458f1ad2cbcb6bb7e5f8 (patch) | |
| tree | 611e0f46e00eddc095de9ec846649fec03d060b8 /setup_native | |
| parent | 3979b8a564975ae97a9441340a34bfa83d7a6ff1 (diff) | |
Clean up makefiles
Diffstat (limited to 'setup_native')
3 files changed, 0 insertions, 9 deletions
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk index d79593abcc69..4c6668db268c 100644 --- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk @@ -34,19 +34,16 @@ USE_DEFFILE=TRUE # --- Settings ----------------------------------------------------- -# NO_DEFAULT_STL=TRUE ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk STDSHL= -# SOLARINC!:=$(SOLARINC:s/stl//) # --- Files -------------------------------------------------------- INCPRE+=.\Include .DIRCACHE=NO -# CFLAGS+=-E SLOFILES = $(SLO)$/regpatchactivex.obj @@ -72,7 +69,6 @@ SHL1STDLIBS+= libcmt.lib SHL1LIBS = $(SLB)$/$(TARGET).lib -#SHL1TARGET = $(TARGET)$(DLLPOSTFIX) SHL1TARGET = $(TARGET) SHL1IMPLIB = i$(TARGET) diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk index 4e8d791eff15..9be7d7093da3 100644 --- a/setup_native/source/win32/customactions/tools/makefile.mk +++ b/setup_native/source/win32/customactions/tools/makefile.mk @@ -62,8 +62,6 @@ STDSHL+= \ STDSHL+=$(LIBSTLPORTST) .ENDIF -#SHL1LIBS = $(SLB)$/$(TARGET).lib - SHL1TARGET = $(TARGET) SHL1IMPLIB = i$(TARGET) diff --git a/setup_native/source/win32/stwrapper/makefile.mk b/setup_native/source/win32/stwrapper/makefile.mk index ca035b4a9ad0..f81d86dc2f19 100644 --- a/setup_native/source/win32/stwrapper/makefile.mk +++ b/setup_native/source/win32/stwrapper/makefile.mk @@ -6,7 +6,6 @@ LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE TARGETTYPE=GUI USE_DEFFILE=TRUE -#DYNAMIC_CRT:= NO_DEFAULT_STL=TRUE # --- Settings ----------------------------------------------------- @@ -46,5 +45,3 @@ DLLPRE = .INCLUDE : target.mk $(OBJ)$/stwrapper.obj: $(INCCOM)$/_version.h - -#$(RCFILES) : resource.rc |