reSWIGged

[wxWidgets.git] / wxPython / distrib / msw / .make

diff --git a/wxPython/distrib/msw/.make b/wxPython/distrib/msw/.make
index 8a0343ac7d0c5e20ac475a259040d4b1337cc346..11c54d30c9c6555a7f617e69fef43b74301b31b9 100644 (file)
--- a/wxPython/distrib/msw/.make
+++ b/wxPython/distrib/msw/.make
@@ -79,8 +79,12 @@ fi
 
 
 echo ------------------
 
 
 echo ------------------

-echo cd $WXWIN/build/msw
+WXWIN=`cygpath -m $WXWIN`

 cd $WXWIN/build/msw
 cd $WXWIN/build/msw

+
+echo mkdir -p $WXWIN/lib/vc_dll/$WXLIBDIR/wx
+mkdir -p $WXWIN/lib/vc_dll/$WXLIBDIR/wx
+echo nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h

 nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
 
 
 nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
 
 


@@ -88,14 +92,14 @@ echo ------------------
 echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@
 echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
 $WXWIN/build/msw/.mymake $BUILD_TYPE $@

-if [ ! $? ]; then error; fi
+if [ ! $? = 0 ]; then error; 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 [ ! $? ]; then error; fi
+if [ ! $? = 0 ]; then error; fi

 cd -
 
 
 cd -
 
 


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

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

 cd -
 
 
 cd -
 
 


@@ -111,7 +115,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 [ ! $? ]; then error; fi
+if [ ! $? = 0 ]; then error; fi

 cd -
 
 
 cd -
 
 


@@ -119,7 +123,7 @@ echo ------------------
 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 [ ! $? ]; then error; fi
+if [ ! $? = 0 ]; then error; fi

 cd -
 
 
 cd -
 
 


@@ -127,9 +131,6 @@ cd -
 echo -----------------
 echo --   SUCCESS!  --
 echo -----------------
 echo -----------------
 echo --   SUCCESS!  --
 echo -----------------

-# copy DLLs to a dir on the PATH
-# copy /U $WXWIN/lib/vc_dll/*.dll $WXWIN/BIN
-# copy /U $WXWIN/lib/vc_dll/*.pdb $WXWIN/BIN

 exit 0
 
 
 exit 0