build tweaks

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

diff --git a/wxPython/distrib/msw/.make b/wxPython/distrib/msw/.make
index a8093c816a1234e38958001a7ec75a6cc6d99539..25d5c47557882dd3eb5f5b641d1de47922e3ecd8 100644 (file)
--- a/wxPython/distrib/msw/.make
+++ b/wxPython/distrib/msw/.make
@@ -82,20 +82,20 @@ echo ------------------
 echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
 nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
 echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
 nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h

-
+if [ ! $? = 0 ]; then error 2; fi

 
 echo ------------------
 echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@
 
 echo ------------------
 echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@

-if [ ! $? = 0 ]; then error; fi
+if [ ! $? = 0 ]; then error 2; fi

 
 
 echo ------------------
 echo cd ../../contrib/build/gizmos
 cd ../../contrib/build/gizmos
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@
 
 
 echo ------------------
 echo cd ../../contrib/build/gizmos
 cd ../../contrib/build/gizmos
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@

-if [ ! $? = 0 ]; then error; fi
+if [ ! $? = 0 ]; then error 2; fi

 cd -
 
 
 cd -
 
 


@@ -103,7 +103,7 @@ cd -
 echo cd ../../contrib/build/animate
 cd ../../contrib/build/animate
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@
 echo cd ../../contrib/build/animate
 cd ../../contrib/build/animate
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@

-if [ ! $? = 0 ]; then error; fi
+if [ ! $? = 0 ]; then error 2; fi

 cd -
 
 
 cd -
 
 


@@ -111,7 +111,7 @@ echo ------------------
 echo cd ../../contrib/build/stc
 cd ../../contrib/build/stc
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@
 echo cd ../../contrib/build/stc
 cd ../../contrib/build/stc
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@

-if [ ! $? = 0 ]; then error; fi
+if [ ! $? = 0 ]; then error 2; fi

 cd -
 
 
 cd -
 
 


@@ -119,7 +119,7 @@ cd -
 # echo cd ../../contrib/build/ogl
 # cd ../../contrib/build/ogl
 # $WXWIN/build/msw/.mymake $BUILD_TYPE CPPFLAGS="-DwxUSE_DEPRECATED=0" $@
 # echo cd ../../contrib/build/ogl
 # cd ../../contrib/build/ogl
 # $WXWIN/build/msw/.mymake $BUILD_TYPE CPPFLAGS="-DwxUSE_DEPRECATED=0" $@

-# if [ ! $? = 0 ]; then error; fi
+# if [ ! $? = 0 ]; then error 2; fi

 # cd -
 
 
 # cd -
 
 

diff --git a/wxPython/distrib/msw/.mymake b/wxPython/distrib/msw/.mymake
index ca42ce7672c58f28dd47fc4825806016cb990231..241b37a2ec1be1889a79efff01557948c3143171 100644 (file)
--- a/wxPython/distrib/msw/.mymake
+++ b/wxPython/distrib/msw/.mymake
@@ -1,6 +1,6 @@
 #! /bin/bash
 
 #! /bin/bash
 

-COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1 CXXFLAGS=/D__NO_VC_CRTDBG__ "
+COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 CXXFLAGS=/D__NO_VC_CRTDBG__ "

 HYBRID_FLAGS="DEBUG_FLAG=1 WXDEBUGFLAG=h"
 MAKE_FLAGS=$COMMON_FLAGS
 
 HYBRID_FLAGS="DEBUG_FLAG=1 WXDEBUGFLAG=h"
 MAKE_FLAGS=$COMMON_FLAGS