diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 04:21:48 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 20:18:10 +0100 |
| commit | c296fe08de3958707d8fc4c2d3131cbcdbc60f1b (patch) | |
| tree | c312b760cf98d8e343708311dd0f9f60e6125176 /stlport | |
| parent | 053754d986bedee85fd2a5076b5f7561e945c5cd (diff) | |
Build STLport only as a compatibility library
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 16 | ||||
| -rw-r--r-- | stlport/prj/d.lst | 22 |
2 files changed, 3 insertions, 35 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index fa1de9438a21..04ab66af2910 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -34,12 +34,12 @@ TARGET=so_stlport .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)"=="YES" +.IF "$(WITH_STLPORT)"!="YES" all: @echo "Nothing to do" -.ELSE # "$(USE_SYSTEM_STL)" +.ELSE # "$(WITH_STLPORT)"!="YES" # --- Files -------------------------------------------------------- .EXPORT : CC CXX @@ -188,16 +188,6 @@ OUT2LIB= \ # --- Targets ------------------------------------------------------ -.IF "$(STLPORT4)"!="NO_STLPORT4" -all : - @echo " An already available installation of STLport has been chosen in the configure process." - @echo " Therefore the version provided here does not need to be built in addition." -.ELIF "$(OS)"=="MACOSX" -all: - @echo '--with-stlport=yes is not supported on Mac OS X' - false -.ENDIF - .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk @@ -229,4 +219,4 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch .ENDIF "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" -.ENDIF # "$(USE_SYSTEM_STL)" +.ENDIF # "$(WITH_STLPORT)"!="YES" diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst index 29848a6475e3..fe7c6f3aab0d 100644 --- a/stlport/prj/d.lst +++ b/stlport/prj/d.lst @@ -1,25 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\stl -mkdir: %_DEST%\inc%_EXT%\stl\stl -mkdir: %_DEST%\inc%_EXT%\stl\stl\debug -mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers -mkdir: %_DEST%\inc%_EXT%\stl\config -mkdir: %_DEST%\inc%_EXT%\stl\using -mkdir: %_DEST%\inc%_EXT%\stl\using\h -mkdir: %_DEST%\inc%_EXT%\stl\wrap_std -mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h -..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\* -..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\* -..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\* -..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\* -..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\* -..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\* -..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\* -..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\* -..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\* -..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\* -..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll |