STC is not a separate library anymore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/msw/.make b/wxPython/distrib/msw/.make
index b5639999dc1e68940523619c126bce1ae5299b9b..26349f5ab94100dbe91affdcdebb6c7bd73b358a 100644 (file)
--- a/wxPython/distrib/msw/.make
+++ b/wxPython/distrib/msw/.make
@@ -108,12 +108,12 @@ if [ ! $? = 0 ]; then error 2; fi
 # cd -
 
 
 # cd -
 
 

-echo ------------------
-echo cd ../../contrib/build/stc
-cd ../../contrib/build/stc
-$WXWIN/build/msw/.mymake $BUILD_TYPE $@
-if [ ! $? = 0 ]; then error 2; fi
-cd -
+# echo ------------------
+# echo cd ../../contrib/build/stc
+# cd ../../contrib/build/stc
+# $WXWIN/build/msw/.mymake $BUILD_TYPE $@
+# if [ ! $? = 0 ]; then error 2; fi
+# cd -

 
 
 # echo ------------------
 
 
 # echo ------------------

diff --git a/wxPython/distrib/msw/.make.btm b/wxPython/distrib/msw/.make.btm
index 973bae21abb6a2c70387c182fdfcc6b8e4c5bfa7..568933aed4fd12e7ec4243dcfa15c902c96e0bc9 100644 (file)
--- a/wxPython/distrib/msw/.make.btm
+++ b/wxPython/distrib/msw/.make.btm
@@ -92,12 +92,12 @@ REM if %? != 0 goto done
 REM cd -
 
 
 REM cd -
 
 

-echo ------------------
-echo cd ..\..\contrib\build\stc
-cd ..\..\contrib\build\stc
-call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
-if %? != 0 goto done
-cd -
+REM echo ------------------
+REM echo cd ..\..\contrib\build\stc
+REM cd ..\..\contrib\build\stc
+REM call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
+REM if %? != 0 goto done
+REM cd -

 
 
 REM echo ------------------
 
 
 REM echo ------------------

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 6c5692821d71546466e93e85278065e5ce0fcae8..15126708b5f90622505b1feb798c9e14259670da 100644 (file)
--- a/wxPython/docs/BUILD.txt
+++ b/wxPython/docs/BUILD.txt
@@ -136,22 +136,11 @@ place, then do the same for wxPython.
                      --with-zlib=builtin \
 
 
                      --with-zlib=builtin \
 
 

-2. To build and install wxWidgets you could just use the "make"
-   command but there are a couple other libraries besides the main
-   wxWidgets libs that also need to be built so again I make a script
-   to do it all for me so I don't forget anything.  This time it is
-   called ".make" (I use the leading "."  so when I do ``rm -r *`` in
-   my build dir I don't lose my scripts too.)  This is what it looks
-   like::
-
-        make $* \
-            && make -C contrib/src/stc $* 
-   
-   So you just use .make as if it where make, but don't forget to set
-   the execute bit on .make first!::
+2. To build and install wxWidgets you just need to run "make" and
+   "make install" and the Makefile will take care of all the work for you::

 
 

-         .make
-         .make install
+         make
+         make install

 
    When it's done you should have an installed set of files under
    /opt/wx/2.8 containing just wxWidgets.  Now to use this version of
 
    When it's done you should have an installed set of files under
    /opt/wx/2.8 containing just wxWidgets.  Now to use this version of


@@ -394,9 +383,9 @@ accordingly if you are using the bash shell.
    selection of command-line flags as described above.  
 
 
    selection of command-line flags as described above.  
 
 

-7.  When that is all done it will have built the main wxWidgets DLLs
-    and also some of the contribs DLLs.  There should be a ton of DLLs
-    and lots of lib files and other stuff in %WXDIR%\\lib\\vc_dll.
+7.  When that is all done it will have built the main wxWidgets DLLs.
+    There should be a ton of DLLs and lots of lib files and other
+    stuff in %WXDIR%\\lib\\vc_dll.

 
 
 8. Building wxPython on Windows is very similar to doing it for the
 
 
 8. Building wxPython on Windows is very similar to doing it for the