[Commits] (davids) Unicode build conversion - fixed UNICODE flags in MSW projects

commits at osafoundation.org commits at osafoundation.org
Mon Apr 4 14:52:12 PDT 2005


Commit by: davids
Modified files:
internal/wxPython-2.5/build/msw/msw.vcproj 1.1 1.2
internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj 1.2 1.3
internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj 1.1 1.2
internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj 1.1 1.2

Log message:

Unicode build conversion - fixed UNICODE flags in MSW projects
r=TBD



ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/build/msw/msw.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: internal/wxPython-2.5/build/msw/msw.vcproj
diff -u internal/wxPython-2.5/build/msw/msw.vcproj:1.1 internal/wxPython-2.5/build/msw/msw.vcproj:1.2
--- internal/wxPython-2.5/build/msw/msw.vcproj:1.1	Fri Apr  9 13:35:40 2004
+++ internal/wxPython-2.5/build/msw/msw.vcproj	Mon Apr  4 14:52:08 2005
@@ -17,10 +17,10 @@
 			ConfigurationType="0">
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0"
-				ReBuildCommandLine="nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0"
-				CleanCommandLine="nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 clean"/>
+				BuildCommandLine="nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0"
+				ReBuildCommandLine="nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0"
+				CleanCommandLine="nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 clean"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"

Index: internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj
diff -u internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj:1.1 internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj:1.2
--- internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj:1.1	Fri Apr  9 13:35:37 2004
+++ internal/wxPython-2.5/contrib/build/stc/wxPythonStc/wxPythonStc.vcproj	Mon Apr  4 14:52:09 2005
@@ -18,14 +18,14 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0
 "
 				ReBuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0
 "
 				CleanCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 clean
 "/>
 		</Configuration>
 		<Configuration
@@ -36,14 +36,14 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0
 "
 				ReBuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0
 "
 				CleanCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 clean
 "/>
 		</Configuration>
 	</Configurations>

Index: internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj
diff -u internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj:1.1 internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj:1.2
--- internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj:1.1	Fri Apr  9 13:35:38 2004
+++ internal/wxPython-2.5/contrib/build/ogl/wxPythonOgl/wxPythonOgl.vcproj	Mon Apr  4 14:52:08 2005
@@ -18,14 +18,14 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
 "
 				ReBuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
 "
 				CleanCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
 "/>
 		</Configuration>
 		<Configuration
@@ -36,14 +36,14 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
 "
 				ReBuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot;
 "
 				CleanCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 CXX=&quot;cl -DwxUSE_DEPRECATED=0&quot; clean
 "/>
 		</Configuration>
 	</Configurations>

Index: internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj
diff -u internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj:1.2 internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj:1.3
--- internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj:1.2	Fri Apr  9 17:46:46 2004
+++ internal/wxPython-2.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj	Mon Apr  4 14:52:08 2005
@@ -18,13 +18,13 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0"
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0"
 				ReBuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0
 "
 				CleanCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0 clean"/>
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=1 MSLU=0 clean"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -34,13 +34,13 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0"
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0"
 				ReBuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 clean
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 clean
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0
 "
 				CleanCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 clean"/>
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=1 MSLU=0 clean"/>
 		</Configuration>
 	</Configurations>
 	<References>



More information about the Commits mailing list