[Wgui-cvs] wgui/tests Notepad-VS71.vcproj,1.1,1.2 Notepad.dsp,1.1,1.2 UnitTests.cpp,1.23,1.24

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wgui/wgui/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8345/tests

Modified Files:
	Notepad-VS71.vcproj Notepad.dsp UnitTests.cpp 
Log Message:
VS7.1 Build fixes.

Index: Notepad-VS71.vcproj
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/Notepad-VS71.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Notepad-VS71.vcproj	20 Apr 2004 19:05:37 -0000	1.1
--- Notepad-VS71.vcproj	22 Apr 2004 07:15:11 -0000	1.2
***************
*** 0 ****
--- 1,148 ----
+ <?xml version="1.0" encoding="Windows-1252"?>
+ <VisualStudioProject
+ 	ProjectType="Visual C++"
+ 	Version="7.10"
+ 	Name="Notepad"
+ 	ProjectGUID="{E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}"
+ 	Keyword="Win32Proj">
+ 	<Platforms>
+ 		<Platform
+ 			Name="Win32"/>
+ 	</Platforms>
+ 	<Configurations>
+ 		<Configuration
+ 			Name="Debug|Win32"
+ 			OutputDirectory="Debug"
+ 			IntermediateDirectory="Debug"
+ 			ConfigurationType="1"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="0"
+ 				AdditionalIncludeDirectories="../includes"
+ 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG"
+ 				MinimalRebuild="TRUE"
+ 				BasicRuntimeChecks="3"
+ 				RuntimeLibrary="3"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="4"
+ 				WarnAsError="TRUE"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="4"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="SDL.lib sdlmain.lib msvcrtd.lib msvcprtd.lib wGuid.lib freetype214_D.lib"
+ 				OutputFile="$(OutDir)/Notepad.exe"
+ 				LinkIncremental="2"
+ 				AdditionalLibraryDirectories="../lib"
+ 				IgnoreAllDefaultLibraries="TRUE"
+ 				GenerateDebugInformation="TRUE"
+ 				ProgramDatabaseFile="$(OutDir)/Notepad.pdb"
+ 				SubSystem="2"
+ 				TargetMachine="1"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 		<Configuration
+ 			Name="Release|Win32"
+ 			OutputDirectory="Release"
+ 			IntermediateDirectory="Release"
+ 			ConfigurationType="1"
+ 			CharacterSet="2">
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+ 				Optimization="2"
+ 				InlineFunctionExpansion="1"
+ 				OmitFramePointers="TRUE"
+ 				AdditionalIncludeDirectories="../includes"
+ 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ 				StringPooling="TRUE"
+ 				RuntimeLibrary="2"
+ 				EnableFunctionLevelLinking="TRUE"
+ 				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
+ 				UsePrecompiledHeader="0"
+ 				WarningLevel="4"
+ 				WarnAsError="TRUE"
+ 				Detect64BitPortabilityProblems="TRUE"
+ 				DebugInformationFormat="3"/>
+ 			<Tool
+ 				Name="VCCustomBuildTool"/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="SDL.lib sdlmain.lib msvcrt.lib MSVCPRT.LIB wGui.lib freetype214.lib"
+ 				OutputFile="$(OutDir)/Notepad.exe"
+ 				LinkIncremental="1"
+ 				AdditionalLibraryDirectories="../lib"
+ 				IgnoreAllDefaultLibraries="TRUE"
+ 				GenerateDebugInformation="TRUE"
+ 				SubSystem="2"
+ 				OptimizeReferences="2"
+ 				EnableCOMDATFolding="2"
+ 				TargetMachine="1"/>
+ 			<Tool
+ 				Name="VCMIDLTool"/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreBuildEventTool"/>
+ 			<Tool
+ 				Name="VCPreLinkEventTool"/>
+ 			<Tool
+ 				Name="VCResourceCompilerTool"/>
+ 			<Tool
+ 				Name="VCWebServiceProxyGeneratorTool"/>
+ 			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
+ 				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ 		</Configuration>
+ 	</Configurations>
+ 	<References>
+ 	</References>
+ 	<Files>
+ 		<Filter
+ 			Name="Source Files"
+ 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+ 			<File
+ 				RelativePath="Notepad.cpp">
+ 			</File>
+ 		</Filter>
+ 		<Filter
+ 			Name="Header Files"
+ 			Filter="h;hpp;hxx;hm;inl;inc">
+ 		</Filter>
+ 		<Filter
+ 			Name="Resource Files"
+ 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ 		</Filter>
+ 	</Files>
+ 	<Globals>
+ 	</Globals>
+ </VisualStudioProject>

Index: Notepad.dsp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/Notepad.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Notepad.dsp	20 Apr 2004 19:05:37 -0000	1.1
--- Notepad.dsp	22 Apr 2004 07:15:11 -0000	1.2
***************
*** 0 ****
--- 1,109 ----
+ # Microsoft Developer Studio Project File - Name="Notepad" - Package Owner=<4>
+ # Microsoft Developer Studio Generated Build File, Format Version 6.00
+ # ** DO NOT EDIT **
+ 
+ # TARGTYPE "Win32 (x86) Application" 0x0101
+ 
+ CFG=Notepad - Win32 Debug
+ !MESSAGE This is not a valid makefile. To build this project using NMAKE,
+ !MESSAGE use the Export Makefile command and run
+ !MESSAGE 
+ !MESSAGE NMAKE /f "Notepad.mak".
+ !MESSAGE 
+ !MESSAGE You can specify a configuration when running NMAKE
+ !MESSAGE by defining the macro CFG on the command line. For example:
+ !MESSAGE 
+ !MESSAGE NMAKE /f "Notepad.mak" CFG="Notepad - Win32 Debug"
+ !MESSAGE 
+ !MESSAGE Possible choices for configuration are:
+ !MESSAGE 
+ !MESSAGE "Notepad - Win32 Release" (based on "Win32 (x86) Application")
+ !MESSAGE "Notepad - Win32 Debug" (based on "Win32 (x86) Application")
+ !MESSAGE 
+ 
+ # Begin Project
+ # PROP AllowPerConfigDependencies 0
+ # PROP Scc_ProjName ""
+ # PROP Scc_LocalPath ""
+ CPP=cl.exe
+ MTL=midl.exe
+ RSC=rc.exe
+ 
+ !IF  "$(CFG)" == "Notepad - Win32 Release"
+ 
+ # PROP BASE Use_MFC 0
+ # PROP BASE Use_Debug_Libraries 0
+ # PROP BASE Output_Dir "Release"
+ # PROP BASE Intermediate_Dir "Release"
+ # PROP BASE Target_Dir ""
+ # PROP Use_MFC 0
+ # PROP Use_Debug_Libraries 0
+ # PROP Output_Dir "Release"
+ # PROP Intermediate_Dir "Release"
+ # PROP Ignore_Export_Lib 0
+ # PROP Target_Dir ""
+ # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+ # ADD CPP /nologo /MD /W3 /GR /GX /O1 /I "../includes" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "MSVC6" /YX /FD /c
+ # SUBTRACT CPP /WX
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ # ADD BASE RSC /l 0x409 /d "NDEBUG"
+ # ADD RSC /l 0x409 /d "NDEBUG"
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+ # ADD LINK32 SDL.lib sdlmain.lib msvcrt.lib MSVCPRT.LIB ../lib/wGui.lib freetype214.lib kernel32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib
+ 
+ !ELSEIF  "$(CFG)" == "Notepad - Win32 Debug"
+ 
+ # PROP BASE Use_MFC 0
+ # PROP BASE Use_Debug_Libraries 1
+ # PROP BASE Output_Dir "Debug"
+ # PROP BASE Intermediate_Dir "Debug"
+ # PROP BASE Target_Dir ""
+ # PROP Use_MFC 0
+ # PROP Use_Debug_Libraries 1
+ # PROP Output_Dir "Debug"
+ # PROP Intermediate_Dir "Debug"
+ # PROP Ignore_Export_Lib 0
+ # PROP Target_Dir ""
+ # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+ # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../includes" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MSVC6" /YX /FD /GZ /c
+ # SUBTRACT CPP /WX
+ # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+ # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+ # ADD BASE RSC /l 0x409 /d "_DEBUG"
+ # ADD RSC /l 0x409 /d "_DEBUG"
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+ # ADD LINK32 SDL.lib sdlmain.lib msvcrtd.lib msvcprtd.lib ../lib/wGuid.lib freetype214_D.lib kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib /pdbtype:sept
+ 
+ !ENDIF 
+ 
+ # Begin Target
+ 
+ # Name "Notepad - Win32 Release"
+ # Name "Notepad - Win32 Debug"
+ # Begin Group "Source Files"
+ 
+ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ # Begin Source File
+ 
+ SOURCE=Notepad.cpp
+ # End Source File
+ # End Group
+ # Begin Group "Header Files"
+ 
+ # PROP Default_Filter "h;hpp;hxx;hm;inl"
+ # End Group
+ # Begin Group "Resource Files"
+ 
+ # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ # End Group
+ # End Target
+ # End Project

Index: UnitTests.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/tests/UnitTests.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** UnitTests.cpp	19 Apr 2004 16:46:08 -0000	1.23
--- UnitTests.cpp	22 Apr 2004 07:15:11 -0000	1.24
***************
*** 23,26 ****
--- 23,27 ----
  
  
+ #include "wgui_include_config.h"
  #include "wgui.h"
  #include "unit_tests/tut.h"