diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 16:20:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 19:57:20 +0100 |
| commit | 553aed7b518599742189ffce50cd947dbf39a2e7 (patch) | |
| tree | cd8d0ae2e88760bb99b9318a71903d8ff535d862 /desktop | |
| parent | c824a1f69c093f38b82ead0f413c75b492a1f994 (diff) | |
Trying to remove the stlport mention from the code
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/pagein/makefile.mk | 8 | ||||
| -rw-r--r-- | desktop/win32/source/setup/makefile.mk | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk index bc63314c9601..09248d4f9469 100644 --- a/desktop/source/pagein/makefile.mk +++ b/desktop/source/pagein/makefile.mk @@ -142,14 +142,6 @@ $(MISC)$/$(TARGET)-common : makefile.mk @-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST) >> $@ @-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST) >> $@ @-echo $(URELIBPATH)$/reflection$(UNODLLPOST) >> $@ -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3" - @-echo $(URELIBPATH)$/$(DLLPRE)stlport_gcc$(DLLPOST) >> $@ -.ENDIF # gcc -.IF "$(COMNAME)" == "sunpro5" - @-echo $(URELIBPATH)$/$(DLLPRE)stlport_sunpro$(DLLPOST) >> $@ -.ENDIF # sunpro5 -.ENDIF # SYSTEM_STL @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@ @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST) >> $@ @-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST) >> $@ diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk index 15b7b1937e78..f0c6e0e955fd 100644 --- a/desktop/win32/source/setup/makefile.mk +++ b/desktop/win32/source/setup/makefile.mk @@ -43,9 +43,9 @@ ENABLE_EXCEPTIONS = TRUE INCPRE+=$(MFC_INCLUDE) -.IF "$(USE_STLP_DEBUG)"!="" +.IF "$(USE_DEBUG_RUNTIME)"!="" CDEFS+=-D_DEBUG -.ENDIF # "$(USE_STLP_DEBUG)"!="" +.ENDIF # "$(USE_DEBUG_RUNTIME)"!="" RCFILES= $(RES)$/$(TARGET).rc |