X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/963a1fcd6e013eef52bf87ed99e19d9ab49563ef..2bed17c862db626a40bfb981cb8d2bfed17b2737:/distrib/msw/makeall.bat diff --git a/distrib/msw/makeall.bat b/distrib/msw/makeall.bat index ef0aa78564..5823cede55 100755 --- a/distrib/msw/makeall.bat +++ b/distrib/msw/makeall.bat @@ -1,5 +1,5 @@ Rem @echo off -Rem This script compiles wxWindows and some samples/demos with +Rem This script compiles wxWidgets and some samples/demos with Rem a range of compilers. Rem Note that it currently uses batch scripts local to Julian Smart's machine, Rem to set up the environment correctly. @@ -19,7 +19,7 @@ Rem The following line is for a specific environment -- edit, or comment out Rem Not working in 4NT? Rem if not %@INDEX["%WXDIR%","wx2stable"] == "-1" set FATWXWIN=c:\wx2sta~1\wxwind~1 -echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN% +echo Full wxWidgets path is %FULLWXWIN%, FAT path is %FATWXWIN% set BUILDDEST=%TEMP%\wxWinBuild Rem Only carry on if we haven't specified a single target set CARRYON=0 @@ -47,12 +47,10 @@ cd %WXDIR%\demos erase /S *.exe cd %WXDIR%\contrib\samples erase /S *.exe -cd %WXDIR%\utils\dialoged\src -erase /S *.exe cd %WXDIR%\utils\tex2rtf\src erase /S *.exe -echo Starting wxWindows build at %_TIME, %_DATE +echo Starting wxWidgets build at %_TIME, %_DATE Rem First, VC++ 6. @@ -126,13 +124,6 @@ nmake -f makefile.vc clean FINAL=1 cd %WXDIR%\contrib\src\ogl nmake -f makefile.vc clean FINAL=1 -Rem Compile Dialog Editor -cd %WXDIR%\utils\dialoged\src -nmake -f makefile.vc clean FINAL=1 -nmake -f makefile.vc FINAL=1 -copy *.exe %BUILDDEST%\VC6Release -nmake -f makefile.vc clean FINAL=1 - Rem Compile Tex2RTF cd %WXDIR%\utils\tex2rtf\src nmake -f makefile.vc clean FINAL=1 @@ -276,13 +267,6 @@ make -f makefile.b32 clean FINAL=1 cd %WXDIR%\contrib\src\ogl make -f makefile.b32 clean FINAL=1 -Rem Compile Dialog Editor -cd %WXDIR%\utils\dialoged\src -make -f makefile.b32 clean FINAL=1 -make -f makefile.b32 FINAL=1 -copy *.exe %BUILDDEST%\BC55Release -make -f makefile.b32 clean FINAL=1 - Rem Compile Tex2RTF cd %WXDIR%\utils\tex2rtf\src make -f makefile.b32 clean FINAL=1 @@ -408,13 +392,6 @@ make -f makefile.g95 clean FINAL=1 cd %WXDIR%\contrib\src\ogl make -f makefile.g95 clean FINAL=1 -Rem Compile Dialog Editor -cd %WXDIR%\utils\dialoged\src -make -f makefile.g95 clean FINAL=1 -make -f makefile.g95 FINAL=1 -copy *.exe %BUILDDEST%\Cygwin11Release -make -f makefile.g95 clean FINAL=1 - Rem Compile Tex2RTF cd %WXDIR%\utils\tex2rtf\src make -f makefile.g95 clean FINAL=1 @@ -488,13 +465,6 @@ make -f makefile.g95 clean FINAL=1 cd %WXDIR%\contrib\src\ogl make -f makefile.g95 clean FINAL=1 -Rem Compile Dialog Editor -cd %WXDIR%\utils\dialoged\src -make -f makefile.g95 clean FINAL=1 -make -f makefile.g95 FINAL=1 -copy *.exe %BUILDDEST%\Ming2952Release -make -f makefile.g95 clean FINAL=1 - Rem Compile Tex2RTF cd %WXDIR%\utils\tex2rtf\src make -f makefile.g95 clean FINAL=1 @@ -520,7 +490,7 @@ echo =================== Rem Set up the environment call msvc1 -Rem Needs full wxWindows path for making libraries +Rem Needs full wxWidgets path for making libraries set WXWIN=%FULLWXWIN% echo *** VC++ Debug *** @@ -534,7 +504,7 @@ erase /F /Y %BUILDDEST%\VC1Debug Rem Make one sample, just to make sure Debug mode is OK cd %WXDIR%\samples\minimal nmake -f makefile.dos clean -Rem Needs FAT wxWindows path for making executables +Rem Needs FAT wxWidgets path for making executables set WXWIN=%FATWXWIN% nmake -f makefile.dos @@ -544,7 +514,7 @@ nmake -f makefile.dos clean cd %WXDIR%\src\msw nmake -f makefile.dos cleanall -Rem Needs full wxWindows path for making libraries +Rem Needs full wxWidgets path for making libraries set WXWIN=%FULLWXWIN% echo *** VC++ Release *** @@ -559,7 +529,7 @@ Rem Make one sample, just to make sure Release mode is OK cd %WXDIR%\samples\minimal nmake -f makefile.dos clean nmake -f makefile.dos FINAL=1 -Rem Needs FAT wxWindows path for making executables +Rem Needs FAT wxWidgets path for making executables set WXWIN=%FATWXWIN% nmake -f makefile.dos FINAL=1 copy minimal.exe /S %BUILDDEST%\VC1Release @@ -621,5 +591,5 @@ make -f makefile.bcc cleanall FINAL=1 :end -echo Finished wxWindows build at %_TIME, %_DATE +echo Finished wxWidgets build at %_TIME, %_DATE