path fixes

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

diff --git a/wxPython/distrib/msw/.make b/wxPython/distrib/msw/.make
index 10fc78abe20b437494804eb17fabe62c47896c71..11c54d30c9c6555a7f617e69fef43b74301b31b9 100644 (file)
--- a/wxPython/distrib/msw/.make
+++ b/wxPython/distrib/msw/.make
@@ -79,8 +79,12 @@ fi
 
 
 echo ------------------
-echo cd $WXWIN/build/msw
+WXWIN=`cygpath -m $WXWIN`
 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
 
 
@@ -127,9 +131,6 @@ cd -
 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
 
 

diff --git a/wxPython/distrib/msw/.make_tools b/wxPython/distrib/msw/.make_tools
index 8047afa1085b0fde37c3c521bfd00d672596de2f..09eb67b86711ca55a955e182ea3b4a5a11c5db5f 100644 (file)
--- a/wxPython/distrib/msw/.make_tools
+++ b/wxPython/distrib/msw/.make_tools
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+mkdir -p $WXWIN/lib/vc_lib/msw/wx
 nmake -f .makesetup.mk $WXWIN/lib/vc_lib/msw/wx/setup.h 
 nmake -f makefile.vc BUILD=release $@
 

diff --git a/wxPython/distrib/msw/.makesetup.mk b/wxPython/distrib/msw/.makesetup.mk
index 6e4b94ae89bd7489cefe7bd24a9f7f6da253cb58..369b10c1dd83a0a7dd9e34b167e31e584315546d 100644 (file)
--- a/wxPython/distrib/msw/.makesetup.mk
+++ b/wxPython/distrib/msw/.makesetup.mk
@@ -1,14 +1,14 @@
 
-SRC=$(WXWIN)\include\wx\msw\setup.h
-DIR=$(WXWIN)\lib
-FILES= $(DIR)\vc_dll\mswd\wx\setup.h \
-        $(DIR)\vc_dll\mswh\wx\setup.h \
-        $(DIR)\vc_dll\mswud\wx\setup.h \
-        $(DIR)\vc_dll\mswuh\wx\setup.h \
-        $(DIR)\vc_dll\msw\wx\setup.h \
-        $(DIR)\vc_dll\mswu\wx\setup.h \
+SRC=$(WXWIN)/include/wx/msw/setup.h
+DIR=$(WXWIN)/lib
+FILES= $(DIR)/vc_dll/mswd/wx/setup.h \
+        $(DIR)/vc_dll/mswh/wx/setup.h \
+        $(DIR)/vc_dll/mswud/wx/setup.h \
+        $(DIR)/vc_dll/mswuh/wx/setup.h \
+        $(DIR)/vc_dll/msw/wx/setup.h \
+        $(DIR)/vc_dll/mswu/wx/setup.h \
        \
-        $(DIR)\vc_lib\msw\wx\setup.h \
+        $(DIR)/vc_lib/msw/wx/setup.h \
 
 
 UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"
@@ -21,37 +21,37 @@ test :
 
 # debug
 $(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswd\wx mkdir /s $(DIR)\vc_dll\mswd\wx
-       cat $(SRC) > $@
+       cat $(SRC) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # hybrid
 $(DIR)\vc_dll\mswh\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswh\wx mkdir /s $(DIR)\vc_dll\mswh\wx
-       cat $(SRC) | $(HYB_SEDCMD) > $@
+       cat $(SRC) | $(HYB_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # release
 $(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
-       cat $(SRC) > $@
+       cat $(SRC) > setup.h.tmp
+       mv setup.h.tmp $@
 
 $(DIR)\vc_lib\msw\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_lib\msw\wx mkdir /s $(DIR)\vc_lib\msw\wx
-       cat $(SRC) > $@
+       cat $(SRC) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # debug-uni
 $(DIR)\vc_dll\mswud\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswud\wx mkdir /s $(DIR)\vc_dll\mswud\wx
-       cat $(SRC) | $(UNI_SEDCMD) > $@
+       cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # hybrid-uni
 $(DIR)\vc_dll\mswuh\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswuh\wx mkdir /s $(DIR)\vc_dll\mswuh\wx
-       cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
+       cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@
 
 # release-uni
 $(DIR)\vc_dll\mswu\wx\setup.h : $(SRC) .makesetup.mk
-       -if not exist  $(DIR)\vc_dll\mswu\wx mkdir /s $(DIR)\vc_dll\mswu\wx
-       cat $(SRC) | $(UNI_SEDCMD) > $@
+       cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
+       mv setup.h.tmp $@