Applied new master define for CommandBar vs. PocketPC mixed bar.

[wxWidgets.git] / wxPython / distrib / msw / .makesetup.mk

diff --git a/wxPython/distrib/msw/.makesetup.mk b/wxPython/distrib/msw/.makesetup.mk
index f997d08996bc9c81ff999bd9c3cc053ac756a7e9..6e4b94ae89bd7489cefe7bd24a9f7f6da253cb58 100644 (file)
--- 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 \
 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_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"
 
 
 UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"


@@ -14,7 +16,8 @@ HYB_SEDCMD=sed "s!wxUSE_MEMORY_TRACING 1!wxUSE_MEMORY_TRACING 0!g;s!wxUSE_DEBUG_
 
 all : $(FILES)
 
 
 all : $(FILES)
 

-
+test :
+       echo $(DIR)\vc_lib\msw\wx\setup.h

 
 # debug
 $(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk
 
 # debug
 $(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk


@@ -26,6 +29,15 @@ $(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) > $@
 
        -if not exist  $(DIR)\vc_dll\mswh\wx mkdir /s $(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 /s $(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 /s $(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
 # 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


@@ -36,11 +48,6 @@ $(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) > $@
 
        -if not exist  $(DIR)\vc_dll\mswuh\wx mkdir /s $(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
 # 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