[Commits] (heikki) Generate setup.h from setup0.h on Windows and tweak the settings to our liking.

[commits at osafoundation.org]

Commit by: heikki
Modified files:
internal/wxPython-2.5/Makefile 1.60 1.61
internal/wxPython-2.5/include/wx/msw/setup.h 2.6 None

Log message:
Generate setup.h from setup0.h on Windows and tweak the settings to our liking.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/Makefile.diff?r1=text&tr1=1.60&r2=text&tr2=1.61
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/include/wx/msw/setup.h.diff?r1=text&tr1=2.6&r2=text&tr2=None

Index: internal/wxPython-2.5/Makefile
diff -u internal/wxPython-2.5/Makefile:1.60 internal/wxPython-2.5/Makefile:1.61
--- internal/wxPython-2.5/Makefile:1.60	Fri Apr 29 16:18:15 2005
+++ internal/wxPython-2.5/Makefile	Fri Apr 29 17:30:09 2005
@@ -30,10 +30,19 @@
 
 ifeq ($(OS),Cygwin)
 
-wxWidgets:
+$(SRC)/include/wx/msw/setup.h:
 	cd $(SRC); \
-        	export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
-		devenv.com build/msw/msw.sln /build $(SNAP)
+	sed -e "s/#define wxUSE_UNICODE 0/#define wxUSE_UNICODE 1/" include/wx/msw/setup0.h | \
+	sed -e "s/#define wxUSE_DIALUP_MANAGER   1/#define wxUSE_DIALUP_MANAGER 0/" | \
+	sed -e "s/#define wxUSE_DISPLAY       0/#define wxUSE_DISPLAY 1/" | \
+	sed -e "s/#define wxUSE_RESOURCES   0/#define wxUSE_RESOURCES 1/"> include/wx/msw/setup.h
+
+setup: $(SRC)/include/wx/msw/setup.h
+
+wxWidgets: setup
+	cd $(SRC); \
+		export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \
+		devenv.com build/msw/msw.sln /build $(Snap)
 	mkdir -p $(PREFIX)/$(SITE)/wx
 	install $(SRC)/lib/vc_dll/*$(WXMAJORVERSIONCOMPACT)$(UNICODE_SUFFIX)$(SUFFIX)*_vc.dll $(PREFIX)/$(SITE)/wx
 
@@ -57,7 +66,8 @@
 
 clean:
 	rm -rf $(SRC)/wxPython/$(BUILD)*
-	cd $(SRC); MAKEFLAGS=; devenv.com build/msw/msw.sln /clean $(SNAP)
+	rm -f $(SRC)/include/wx/msw/setup.h
+	cd $(SRC); MAKEFLAGS=; devenv.com build/msw/msw.sln /clean $(Snap)
 
 cleanmanifest:
 	cd $(BUILD_ROOT); \