X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/distrib/msw/.makesetup.mk

diff --git a/wxPython/distrib/msw/.makesetup.mk b/wxPython/distrib/msw/.makesetup.mk
index f997d08996..0cc9bef97a 100644
--- a/wxPython/distrib/msw/.makesetup.mk
+++ b/wxPython/distrib/msw/.makesetup.mk
@@ -1,5 +1,5 @@
 
-SRC=..\..\include\wx\msw\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 \
@@ -7,6 +7,8 @@ FILES=	$(DIR)\vc_dll\mswd\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 \
 
 
 UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"
@@ -14,36 +16,41 @@ HYB_SEDCMD=sed "s!wxUSE_MEMORY_TRACING 1!wxUSE_MEMORY_TRACING 0!g;s!wxUSE_DEBUG_
 
 all : $(FILES)
 
-
+test :
+	echo $(DIR)\vc_lib\msw\wx\setup.h
 
 # 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
+	-if not exist  $(DIR)\vc_dll\mswd\wx mkdir $(DIR)\vc_dll\mswd\wx
 	cat $(SRC) > $@
 
 # 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
+	-if not exist  $(DIR)\vc_dll\mswh\wx mkdir $(DIR)\vc_dll\mswh\wx
 	cat $(SRC) | $(HYB_SEDCMD) > $@
 
+# release
+$(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
+	-if not exist  $(DIR)\vc_dll\msw\wx mkdir $(DIR)\vc_dll\msw\wx
+	cat $(SRC) > $@
+
+$(DIR)\vc_lib\msw\wx\setup.h : $(SRC) .makesetup.mk
+	-if not exist  $(DIR)\vc_lib\msw\wx mkdir $(DIR)\vc_lib\msw\wx
+	cat $(SRC) > $@
+
 # 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
+	-if not exist  $(DIR)\vc_dll\mswud\wx mkdir $(DIR)\vc_dll\mswud\wx
 	cat $(SRC) | $(UNI_SEDCMD) > $@
 
 # 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
+	-if not exist  $(DIR)\vc_dll\mswuh\wx mkdir $(DIR)\vc_dll\mswuh\wx
 	cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
 
-# 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) > $@
-
 # 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
+	-if not exist  $(DIR)\vc_dll\mswu\wx mkdir $(DIR)\vc_dll\mswu\wx
 	cat $(SRC) | $(UNI_SEDCMD) > $@