[sword-svn] r41 - in trunk/src: . Dll1 gui simplegui

scribe at www.crosswire.org scribe at www.crosswire.org
Mon Nov 5 22:42:58 MST 2007


Author: scribe
Date: 2007-11-05 22:42:56 -0700 (Mon, 05 Nov 2007)
New Revision: 41

Modified:
   trunk/src/Dll1/Dll1.vcl
   trunk/src/Dll1/Dll1.vcp
   trunk/src/SwRd.vcb
   trunk/src/SwRd.vco
   trunk/src/gui/Utils.h
   trunk/src/gui/gui.vcl
   trunk/src/simplegui/simplegui.vcl
   trunk/src/simplegui/simplegui.vcp
Log:
updated to compile to emulator successfully.

Modified: trunk/src/Dll1/Dll1.vcl
===================================================================
--- trunk/src/Dll1/Dll1.vcl	2007-10-16 00:20:36 UTC (rev 40)
+++ trunk/src/Dll1/Dll1.vcl	2007-11-06 05:42:56 UTC (rev 41)
@@ -3,272 +3,15 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: Dll1 - Win32 (WCE x86) Release--------------------
+--------------------Configuration: Dll1 - Win32 (WCE x86) Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSPBC.tmp" with contents
-[
-/nologo /W3 /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "_X86_" /D "x86" /D "NDEBUG" /D "DEBUG" /D "_i386_" /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D UNDER_CE=300 /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /D "NO_VSNPRINTF" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /Fp"X86Rel/Dll1.pch" /YX /Fo"X86Rel/" /Gs8192 /GF /Oxs /c 
-"D:\src\sword\src\mgr\swcacher.cpp"
-"D:\src\sword\src\mgr\swconfig.cpp"
-"D:\src\sword\src\mgr\swfiltermgr.cpp"
-"D:\src\sword\src\mgr\swlocale.cpp"
-"D:\src\sword\src\mgr\swmgr.cpp"
-"D:\src\sword\src\mgr\swsearchable.cpp"
-"D:\src\sword\src\keys\listkey.cpp"
-"D:\src\sword\src\keys\strkey.cpp"
-"D:\src\sword\src\keys\swkey.cpp"
-"D:\src\sword\src\keys\treekey.cpp"
-"D:\src\sword\src\keys\treekeyidx.cpp"
-"D:\src\sword\src\keys\versekey.cpp"
-"D:\src\sword\src\keys\versetreekey.cpp"
-"D:\src\sword\src\frontend\swdisp.cpp"
-"D:\src\sword\src\frontend\swlog.cpp"
-"D:\src\swordreader\src\Dll1\winceSword\src\dirent.cpp"
-"D:\src\swordreader\src\Dll1\winceSword\src\fcntl.cpp"
-"D:\src\swordreader\src\Dll1\winceSword\src\iostream.cpp"
-"D:\src\swordreader\src\Dll1\winceSword\src\swordce.cpp"
-"D:\src\swordreader\src\Dll1\winceSword\src\swwinlog.cpp"
-"D:\src\swordreader\src\Dll1\winceSword\src\unistd.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSPBC.tmp" 
-Creating temporary file "C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSPBD.tmp" with contents
-[
-commctrl.lib coredll.lib corelibc.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /incremental:no /pdb:"X86Rel/sword.pdb" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib /out:"../../sword.dll" /implib:"X86Rel/sword.lib" /subsystem:windowsce,3.00 /MACHINE:IX86 
-.\X86Rel\adler32.obj
-.\X86Rel\compress.obj
-.\X86Rel\crc32.obj
-.\X86Rel\deflate.obj
-.\X86Rel\infblock.obj
-.\X86Rel\infcodes.obj
-.\X86Rel\inffast.obj
-.\X86Rel\inflate.obj
-.\X86Rel\inftrees.obj
-.\X86Rel\infutil.obj
-.\X86Rel\maketree.obj
-.\X86Rel\trees.obj
-.\X86Rel\uncompr.obj
-.\X86Rel\zutil.obj
-.\X86Rel\regex.obj
-.\X86Rel\roman.obj
-.\X86Rel\swbuf.obj
-.\X86Rel\swobject.obj
-.\X86Rel\swunicod.obj
-.\X86Rel\swversion.obj
-.\X86Rel\url.obj
-.\X86Rel\utilstr.obj
-.\X86Rel\utilxml.obj
-.\X86Rel\hrefcom.obj
-.\X86Rel\rawcom.obj
-.\X86Rel\rawfiles.obj
-.\X86Rel\zcom.obj
-.\X86Rel\rawcom4.obj
-.\X86Rel\swcom.obj
-.\X86Rel\entriesblk.obj
-.\X86Rel\lzsscomprs.obj
-.\X86Rel\rawstr.obj
-.\X86Rel\rawstr4.obj
-.\X86Rel\rawverse.obj
-.\X86Rel\rawverse4.obj
-.\X86Rel\sapphire.obj
-.\X86Rel\swcipher.obj
-.\X86Rel\swcomprs.obj
-.\X86Rel\zipcomprs.obj
-.\X86Rel\zstr.obj
-.\X86Rel\zverse.obj
-.\X86Rel\cipherfil.obj
-.\X86Rel\gbffootnotes.obj
-.\X86Rel\gbfheadings.obj
-.\X86Rel\gbfhtml.obj
-.\X86Rel\gbfhtmlhref.obj
-.\X86Rel\gbfmorph.obj
-.\X86Rel\gbfosis.obj
-.\X86Rel\gbfplain.obj
-.\X86Rel\gbfredletterwords.obj
-.\X86Rel\gbfrtf.obj
-.\X86Rel\gbfstrongs.obj
-.\X86Rel\gbfthml.obj
-.\X86Rel\gbfwebif.obj
-.\X86Rel\greeklexattribs.obj
-.\X86Rel\latin1utf16.obj
-.\X86Rel\latin1utf8.obj
-.\X86Rel\osisfootnotes.obj
-.\X86Rel\osisheadings.obj
-.\X86Rel\osishtmlhref.obj
-.\X86Rel\osislemma.obj
-.\X86Rel\osismorph.obj
-.\X86Rel\osismorphsegmentation.obj
-.\X86Rel\osisosis.obj
-.\X86Rel\osisplain.obj
-.\X86Rel\osisredletterwords.obj
-.\X86Rel\osisrtf.obj
-.\X86Rel\osisscripref.obj
-.\X86Rel\osisstrongs.obj
-.\X86Rel\osiswebif.obj
-.\X86Rel\papyriplain.obj
-.\X86Rel\plainfootnotes.obj
-.\X86Rel\plainhtml.obj
-.\X86Rel\rtfhtml.obj
-.\X86Rel\scsuutf8.obj
-.\X86Rel\swbasicfilter.obj
-.\X86Rel\swoptfilter.obj
-.\X86Rel\teiplain.obj
-.\X86Rel\teirtf.obj
-.\X86Rel\thmlfootnotes.obj
-.\X86Rel\thmlgbf.obj
-.\X86Rel\thmlheadings.obj
-.\X86Rel\thmlhtml.obj
-.\X86Rel\thmlhtmlhref.obj
-.\X86Rel\thmllemma.obj
-.\X86Rel\thmlmorph.obj
-.\X86Rel\thmlosis.obj
-.\X86Rel\thmlplain.obj
-.\X86Rel\thmlrtf.obj
-.\X86Rel\thmlscripref.obj
-.\X86Rel\thmlstrongs.obj
-.\X86Rel\thmlvariants.obj
-.\X86Rel\thmlwebif.obj
-.\X86Rel\unicodertf.obj
-.\X86Rel\utf16utf8.obj
-.\X86Rel\utf8arshaping.obj
-.\X86Rel\utf8bidireorder.obj
-.\X86Rel\utf8cantillation.obj
-.\X86Rel\utf8greekaccents.obj
-.\X86Rel\utf8hebrewpoints.obj
-.\X86Rel\utf8html.obj
-.\X86Rel\utf8latin1.obj
-.\X86Rel\utf8nfc.obj
-.\X86Rel\utf8nfkd.obj
-.\X86Rel\utf8transliterator.obj
-.\X86Rel\utf8utf16.obj
-.\X86Rel\rawgenbook.obj
-.\X86Rel\swgenbook.obj
-.\X86Rel\rawld.obj
-.\X86Rel\rawld4.obj
-.\X86Rel\zld.obj
-.\X86Rel\swld.obj
-.\X86Rel\rawtext.obj
-.\X86Rel\ztext.obj
-.\X86Rel\rawtext4.obj
-.\X86Rel\swtext.obj
-.\X86Rel\swmodule.obj
-.\X86Rel\encfiltmgr.obj
-.\X86Rel\filemgr.obj
-.\X86Rel\localemgr.obj
-.\X86Rel\markupfiltmgr.obj
-.\X86Rel\stringmgr.obj
-.\X86Rel\swcacher.obj
-.\X86Rel\swconfig.obj
-.\X86Rel\swfiltermgr.obj
-.\X86Rel\swlocale.obj
-.\X86Rel\swmgr.obj
-.\X86Rel\swsearchable.obj
-.\X86Rel\listkey.obj
-.\X86Rel\strkey.obj
-.\X86Rel\swkey.obj
-.\X86Rel\treekey.obj
-.\X86Rel\treekeyidx.obj
-.\X86Rel\versekey.obj
-.\X86Rel\versetreekey.obj
-.\X86Rel\swdisp.obj
-.\X86Rel\swlog.obj
-.\X86Rel\dirent.obj
-.\X86Rel\fcntl.obj
-.\X86Rel\iostream.obj
-.\X86Rel\swordce.obj
-.\X86Rel\swwinlog.obj
-.\X86Rel\unistd.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSPBD.tmp"
-<h3>Output Window</h3>
-Compiling...
-swcacher.cpp
-swconfig.cpp
-..\..\..\sword\include\swconfig.h(51) : warning C4251: 'Sections' : class 'std::map<class sword::SWBuf,class sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWConfig'
-D:\src\sword\src\mgr\swconfig.cpp(52) : warning C4800: 'char' : forcing value to bool 'true' or 'false' (performance warning)
-D:\src\sword\src\mgr\swconfig.cpp(84) : warning C4800: 'char' : forcing value to bool 'true' or 'false' (performance warning)
-swfiltermgr.cpp
-..\..\..\sword\include\swconfig.h(51) : warning C4251: 'Sections' : class 'std::map<class sword::SWBuf,class sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWConfig'
-swlocale.cpp
-..\..\..\sword\include\swconfig.h(51) : warning C4251: 'Sections' : class 'std::map<class sword::SWBuf,class sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWConfig'
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\versekey.h(111) : warning C4251: 'localeCache' : class 'sword::VerseKey::LocaleCache' needs to have dll-interface to be used by clients of class 'sword::VerseKey'
-        ..\..\..\sword\include\versekey.h(76) : see declaration of 'LocaleCache'
-swmgr.cpp
-..\..\..\sword\include\swconfig.h(51) : warning C4251: 'Sections' : class 'std::map<class sword::SWBuf,class sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWConfig'
-..\..\..\sword\include\swmgr.h(104) : warning C4251: 'optionFilters' : class 'std::map<class sword::SWBuf,class sword::SWOptionFilter *,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWMgr'
-..\..\..\sword\include\swmgr.h(105) : warning C4251: 'cipherFilters' : class 'std::map<class sword::SWBuf,class sword::SWFilter *,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWMgr'
-..\..\..\sword\include\swmgr.h(111) : warning C4251: 'cleanupFilters' : class 'std::list<class sword::SWFilter *,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWMgr'
-..\..\..\sword\include\swmgr.h(112) : warning C4251: 'options' : class 'std::list<class sword::SWBuf,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWMgr'
-..\..\..\sword\include\swmgr.h(118) : warning C4251: 'augPaths' : class 'std::list<class sword::SWBuf,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWMgr'
-..\..\..\sword\include\swmgr.h(199) : warning C4251: 'Modules' : class 'std::map<class sword::SWBuf,class sword::SWModule *,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWMgr'
-..\..\..\sword\include\swdisp.h(36) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWDisplay'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\swmodule.h(91) : warning C4251: 'ownConfig' : class 'sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >' needs to have dll-interface to be used by clients of class 'sword::SWModule'
-..\..\..\sword\include\swmodule.h(93) : warning C4251: 'entryAttributes' : class 'std::map<class sword::SWBuf,class std::map<class sword::SWBuf,class std::map<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWModule'
-..\..\..\sword\include\utilxml.h(44) : warning C4251: 'attributes' : class 'std::map<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::XMLTag'
-..\..\..\sword\include\thmlvariants.h(39) : warning C4251: 'options' : class 'std::list<class sword::SWBuf,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::ThMLVariants'
-..\..\..\sword\include\swcipher.h(34) : warning C4251: 'master' : class 'sword::sapphire' needs to have dll-interface to be used by clients of class 'sword::SWCipher'
-        ..\..\..\sword\include\sapphire.h(27) : see declaration of 'sapphire'
-..\..\..\sword\include\swcipher.h(35) : warning C4251: 'work' : class 'sword::sapphire' needs to have dll-interface to be used by clients of class 'sword::SWCipher'
-        ..\..\..\sword\include\sapphire.h(27) : see declaration of 'sapphire'
-swsearchable.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-listkey.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-strkey.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-swkey.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-treekey.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-treekeyidx.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\treekeyidx.h(51) : warning C4251: 'currentNode' : class 'sword::TreeKeyIdx::TreeNode' needs to have dll-interface to be used by clients of class 'sword::TreeKeyIdx'
-        ..\..\..\sword\include\treekeyidx.h(39) : see declaration of 'TreeNode'
-D:\src\sword\src\keys\treekeyidx.cpp(418) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-versekey.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\versekey.h(111) : warning C4251: 'localeCache' : class 'sword::VerseKey::LocaleCache' needs to have dll-interface to be used by clients of class 'sword::VerseKey'
-        ..\..\..\sword\include\versekey.h(76) : see declaration of 'LocaleCache'
-versetreekey.cpp
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\versekey.h(111) : warning C4251: 'localeCache' : class 'sword::VerseKey::LocaleCache' needs to have dll-interface to be used by clients of class 'sword::VerseKey'
-        ..\..\..\sword\include\versekey.h(76) : see declaration of 'LocaleCache'
-swdisp.cpp
-..\..\..\sword\include\swdisp.h(36) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWDisplay'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\swkey.h(71) : warning C4275: non dll-interface class 'sword::SWObject' used as base for dll-interface class 'sword::SWKey'
-        ..\..\..\sword\include\swobject.h(51) : see declaration of 'SWObject'
-..\..\..\sword\include\swconfig.h(51) : warning C4251: 'Sections' : class 'std::map<class sword::SWBuf,class sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWConfig'
-..\..\..\sword\include\swmodule.h(91) : warning C4251: 'ownConfig' : class 'sword::multimapwithdefault<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf> >' needs to have dll-interface to be used by clients of class 'sword::SWModule'
-..\..\..\sword\include\swmodule.h(93) : warning C4251: 'entryAttributes' : class 'std::map<class sword::SWBuf,class std::map<class sword::SWBuf,class std::map<class sword::SWBuf,class sword::SWBuf,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >,struct std::less<class sword::SWBuf>,class std::__default_alloc_template<0,0> >' needs to have dll-interface to be used by clients of class 'sword::SWModule'
-swlog.cpp
-dirent.cpp
-fcntl.cpp
-iostream.cpp
-swordce.cpp
-swwinlog.cpp
-unistd.cpp
-Linking...
-   Creating library X86Rel/sword.lib and object X86Rel/sword.exp
 
 
 
 
 <h3>Results</h3>
-sword.dll - 0 error(s), 39 warning(s)
+sword.dll - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>

Modified: trunk/src/Dll1/Dll1.vcp
===================================================================
--- trunk/src/Dll1/Dll1.vcp	2007-10-16 00:20:36 UTC (rev 40)
+++ trunk/src/Dll1/Dll1.vcp	2007-11-06 05:42:56 UTC (rev 41)
@@ -52,7 +52,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "DLL1_EXPORTS" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /D "NO_VSNPRINTF" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "NO_VSNPRINTF" /D "DEBUG" /D "_i386_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /FR /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -85,7 +86,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /D "RC_INVOKED" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /YX /D /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "ARM" /D "_ARM_" /D "_X86_" /D "x86" /D "RC_INVOKED" /D "DEBUG" /D "_i386_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /D "NO_VSNPRINTF" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /D /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -119,7 +121,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "DLL1_EXPORTS" /YX /Gs8192 /GF /Oxs /c
-# ADD CPP /nologo /W3 /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /YX /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "_X86_" /D "x86" /D "NDEBUG" /D "DEBUG" /D "_i386_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /D "NO_VSNPRINTF" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /Gs8192 /GF /Oxs /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -152,7 +155,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "DLL1_EXPORTS" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /w /W0 /Zi /Od /I "sword\include" /I "winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /U "HAVE_CONFIG_H" /U "VERSEKEY_H" /FR /YX /Gs8192 /GF /c
+# ADD CPP /nologo /w /W0 /Zi /Od /I "sword\include" /I "winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "_X86_" /D "x86" /D "NO_VSNPRINTF" /D "DEBUG" /D "_i386_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /U "HAVE_CONFIG_H" /U "VERSEKEY_H" /FR /Gs8192 /GF /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -1414,6 +1418,8 @@
 
 DEP_CPP_UTILS=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\localemgr.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
 
@@ -1565,7 +1571,6 @@
 
 DEP_CPP_HREFC=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\hrefcom.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
@@ -1575,7 +1580,6 @@
 	"..\..\..\sword\include\swcom.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
@@ -1583,14 +1587,7 @@
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_HREFC=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -1701,22 +1698,13 @@
 	"..\..\..\sword\include\swcom.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWCO=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -1827,22 +1815,13 @@
 	"..\..\..\sword\include\swcom.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWFI=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -1950,31 +1929,20 @@
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\rawverse.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swcom.h"\
-	"..\..\..\sword\include\swcomprs.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
 	"..\..\..\sword\include\zcom.h"\
 	"..\..\..\sword\include\zverse.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_ZCOM_=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -2162,27 +2130,20 @@
 DEP_CPP_SWCOM=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\localemgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swcom.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_SWCOM=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -2335,16 +2296,13 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\rawstr.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWST=\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -2411,16 +2369,13 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\rawstr4.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWSTR=\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -2504,20 +2459,14 @@
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\rawverse.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWVE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -2633,7 +2582,6 @@
 DEP_CPP_SAPPH=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\sapphire.h"\
-	".\winceSword\include\unistd.h"\
 	
 
 !ENDIF 
@@ -2832,18 +2780,15 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\entriesblk.h"\
 	"..\..\..\sword\include\filemgr.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swcomprs.h"\
+	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\zstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_ZSTR_=\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -2930,8 +2875,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\rawverse.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swcomprs.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
@@ -2940,14 +2885,7 @@
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
 	"..\..\..\sword\include\zverse.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_ZVERS=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3020,16 +2958,7 @@
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcipher.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_CIPHE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3136,16 +3065,9 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_GBFFO=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3209,17 +3131,8 @@
 	"..\..\..\sword\include\gbfheadings.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFHE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3284,16 +3197,7 @@
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFHT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3401,16 +3305,10 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\url.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_GBFHTM=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3474,17 +3372,8 @@
 	"..\..\..\sword\include\gbfmorph.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFMO=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3590,16 +3479,8 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
-	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_GBFOS=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3660,16 +3541,7 @@
 	"..\..\..\sword\include\gbfplain.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFPL=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3766,14 +3638,7 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFRE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3835,16 +3700,8 @@
 	"..\..\..\sword\include\gbfrtf.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFRT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -3941,14 +3798,7 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFST=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4009,16 +3859,7 @@
 	"..\..\..\sword\include\gbfthml.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GBFTH=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4088,16 +3929,8 @@
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\url.h"\
 	
-NODEP_CPP_GBFWE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4190,15 +4023,9 @@
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_GREEK=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4259,16 +4086,7 @@
 	"..\..\..\sword\include\latin1utf16.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_LATIN=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4361,14 +4179,7 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_LATIN1=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4480,12 +4291,6 @@
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISF=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4589,12 +4394,6 @@
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_OSISH=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4693,6 +4492,7 @@
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\osishtmlhref.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
@@ -4704,16 +4504,11 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\url.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISHT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4780,18 +4575,9 @@
 	"..\..\..\sword\include\osislemma.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_OSISL=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -4857,18 +4643,8 @@
 	"..\..\..\sword\include\osismorph.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\utilstr.h"\
-	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_OSISM=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5062,16 +4838,9 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISO=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5140,21 +4909,17 @@
 
 DEP_CPP_OSISP=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\osisplain.h"\
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
+	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISP=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5253,15 +5018,7 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
-	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_OSISR=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5359,6 +5116,7 @@
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\osisrtf.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
@@ -5374,12 +5132,6 @@
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISRT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5479,15 +5231,8 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_OSISS=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5583,18 +5328,14 @@
 	"..\..\..\sword\include\swdisp.h"\
 	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilxml.h"\
+	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISST=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5706,16 +5447,10 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\url.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_OSISW=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5831,14 +5566,7 @@
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_PLAIN=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5899,16 +5627,7 @@
 	"..\..\..\sword\include\plainhtml.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_PLAINH=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -5969,16 +5688,7 @@
 	"..\..\..\sword\include\rtfhtml.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_RTFHT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6071,14 +5781,7 @@
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SCSUU=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6138,19 +5841,12 @@
 
 DEP_CPP_SWBAS=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWBAS=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6211,17 +5907,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWOPT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6474,16 +6162,9 @@
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlfootnotes.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_THMLF=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6544,17 +6225,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\thmlgbf.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_THMLG=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6628,21 +6301,22 @@
 
 DEP_CPP_THMLH=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
 	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlheadings.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_THMLH=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6742,15 +6416,8 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_THMLHT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6859,16 +6526,11 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlhtmlhref.h"\
+	"..\..\..\sword\include\url.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_THMLHTM=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -6932,18 +6594,10 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\thmllemma.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_THMLL=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7006,18 +6660,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\thmlmorph.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_THMLM=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7124,14 +6769,9 @@
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlosis.h"\
 	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_THMLO=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7191,17 +6831,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\thmlplain.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_THMLP=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7313,12 +6944,6 @@
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_THMLR=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7425,16 +7050,9 @@
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlscripref.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_THMLS=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7534,12 +7152,6 @@
 	"..\..\..\sword\include\thmlstrongs.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_THMLST=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7613,26 +7225,12 @@
 
 DEP_CPP_THMLV=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_THMLV=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7737,15 +7335,9 @@
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\thmlhtmlhref.h"\
 	"..\..\..\sword\include\thmlwebif.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\url.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_THMLW=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7805,17 +7397,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\unicodertf.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UNICO=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7875,17 +7458,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf16utf8.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF16=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -7946,17 +7520,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8arshaping.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8A=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8017,17 +7583,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8bidireorder.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8B=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8090,18 +7648,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\utf8cantillation.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8C=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8165,18 +7714,10 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\utf8greekaccents.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utf8nfkd.h"\
 	
-NODEP_CPP_UTF8G=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8239,18 +7780,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\utf8hebrewpoints.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8H=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8310,17 +7842,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8html.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8HT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8380,17 +7903,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8latin1.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8L=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8451,17 +7965,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8nfc.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8N=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8522,17 +8028,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8nfkd.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8NF=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8634,15 +8132,12 @@
 	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\utf8transliterator.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
 NODEP_CPP_UTF8T=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
 	"..\..\..\sword\src\modules\filters\unicode\resbund.h"\
 	
 
@@ -8704,17 +8199,8 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utf8utf16.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_UTF8U=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8840,7 +8326,6 @@
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swgenbook.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
@@ -8851,14 +8336,9 @@
 	"..\..\..\sword\include\treekey.h"\
 	"..\..\..\sword\include\treekeyidx.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\versetreekey.h"\
 	
-NODEP_CPP_RAWGE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -8950,33 +8430,19 @@
 !ELSEIF  "$(CFG)" == "Dll1 - Win32 (WCE x86) Debug"
 
 DEP_CPP_SWGEN=\
-	"..\..\..\sword\include\config.h"\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swgenbook.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\sysdata.h"\
-	"..\..\..\sword\include\treekey.h"\
-	"..\..\..\sword\include\treekeyidx.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWGEN=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9084,27 +8550,17 @@
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\rawld.h"\
 	"..\..\..\sword\include\rawstr.h"\
-	"..\..\..\sword\include\strkey.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swld.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWLD=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9209,27 +8665,17 @@
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\rawld4.h"\
 	"..\..\..\sword\include\rawstr4.h"\
-	"..\..\..\sword\include\strkey.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swld.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWLD4=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9332,29 +8778,19 @@
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\strkey.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swld.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\zld.h"\
 	"..\..\..\sword\include\zstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_ZLD_C=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9447,21 +8883,12 @@
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swld.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWLD_=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9574,6 +9001,7 @@
 !ELSEIF  "$(CFG)" == "Dll1 - Win32 (WCE x86) Debug"
 
 DEP_CPP_RAWTE=\
+	"..\..\..\sword\include\config.h"\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
@@ -9582,27 +9010,21 @@
 	"..\..\..\sword\include\rawtext.h"\
 	"..\..\..\sword\include\rawverse.h"\
 	"..\..\..\sword\include\regex.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_RAWTE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9713,37 +9135,27 @@
 !ELSEIF  "$(CFG)" == "Dll1 - Win32 (WCE x86) Debug"
 
 DEP_CPP_ZTEXT=\
+	"..\..\..\sword\include\config.h"\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\rawstr.h"\
-	"..\..\..\sword\include\rawverse.h"\
 	"..\..\..\sword\include\regex.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swcomprs.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\versekey.h"\
 	"..\..\..\sword\include\ztext.h"\
 	"..\..\..\sword\include\zverse.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_ZTEXT=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -9955,27 +9367,20 @@
 DEP_CPP_SWTEX=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\localemgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_SWTEX=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10070,10 +9475,13 @@
 !ELSEIF  "$(CFG)" == "Dll1 - Win32 (WCE x86) Debug"
 
 DEP_CPP_SWMOD=\
+	"..\..\..\sword\include\config.h"\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\regex.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
@@ -10083,16 +9491,14 @@
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\sysdata.h"\
+	"..\..\..\sword\include\treekey.h"\
+	"..\..\..\sword\include\treekeyidx.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_SWMOD=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10216,7 +9622,6 @@
 	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
@@ -10227,12 +9632,6 @@
 	"..\..\..\sword\include\utf8utf16.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_ENCFI=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10281,6 +9680,7 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	".\winceSword\include\dirent.h"\
 	".\winceSword\include\unistd.h"\
@@ -10384,34 +9784,18 @@
 DEP_CPP_LOCAL=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
-	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\localemgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swfiltermgr.h"\
-	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swlocale.h"\
 	"..\..\..\sword\include\swlog.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	"..\..\..\sword\include\versekey.h"\
 	".\winceSword\include\dirent.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_LOCAL=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10582,6 +9966,7 @@
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\osishtmlhref.h"\
 	"..\..\..\sword\include\osisosis.h"\
+	"..\..\..\sword\include\osisplain.h"\
 	"..\..\..\sword\include\osisrtf.h"\
 	"..\..\..\sword\include\osiswebif.h"\
 	"..\..\..\sword\include\plainhtml.h"\
@@ -10593,11 +9978,12 @@
 	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\teiplain.h"\
+	"..\..\..\sword\include\teirtf.h"\
 	"..\..\..\sword\include\thmlgbf.h"\
 	"..\..\..\sword\include\thmlhtml.h"\
 	"..\..\..\sword\include\thmlhtmlhref.h"\
@@ -10605,15 +9991,8 @@
 	"..\..\..\sword\include\thmlplain.h"\
 	"..\..\..\sword\include\thmlrtf.h"\
 	"..\..\..\sword\include\thmlwebif.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\utilxml.h"\
 	
-NODEP_CPP_MARKU=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10777,15 +10156,10 @@
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_SWCON=\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10860,27 +10234,11 @@
 
 DEP_CPP_SWFIL=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swfiltermgr.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWFIL=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -10964,12 +10322,6 @@
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
 	
-NODEP_CPP_SWLOC=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11248,7 +10600,6 @@
 
 DEP_CPP_SWMGR=\
 	"..\..\..\sword\include\cipherfil.h"\
-	"..\..\..\sword\include\config.h"\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\gbffootnotes.h"\
@@ -11266,11 +10617,14 @@
 	"..\..\..\sword\include\osisheadings.h"\
 	"..\..\..\sword\include\osislemma.h"\
 	"..\..\..\sword\include\osismorph.h"\
+	"..\..\..\sword\include\osismorphsegmentation.h"\
 	"..\..\..\sword\include\osisplain.h"\
 	"..\..\..\sword\include\osisredletterwords.h"\
 	"..\..\..\sword\include\osisscripref.h"\
 	"..\..\..\sword\include\osisstrongs.h"\
+	"..\..\..\sword\include\papyriplain.h"\
 	"..\..\..\sword\include\rawcom.h"\
+	"..\..\..\sword\include\rawcom4.h"\
 	"..\..\..\sword\include\rawfiles.h"\
 	"..\..\..\sword\include\rawgenbook.h"\
 	"..\..\..\sword\include\rawld.h"\
@@ -11278,9 +10632,10 @@
 	"..\..\..\sword\include\rawstr.h"\
 	"..\..\..\sword\include\rawstr4.h"\
 	"..\..\..\sword\include\rawtext.h"\
+	"..\..\..\sword\include\rawtext4.h"\
 	"..\..\..\sword\include\rawverse.h"\
+	"..\..\..\sword\include\rawverse4.h"\
 	"..\..\..\sword\include\sapphire.h"\
-	"..\..\..\sword\include\strkey.h"\
 	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
@@ -11295,14 +10650,13 @@
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swld.h"\
 	"..\..\..\sword\include\swlog.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
 	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\sysdata.h"\
+	"..\..\..\sword\include\teiplain.h"\
 	"..\..\..\sword\include\thmlfootnotes.h"\
 	"..\..\..\sword\include\thmlheadings.h"\
 	"..\..\..\sword\include\thmllemma.h"\
@@ -11311,14 +10665,12 @@
 	"..\..\..\sword\include\thmlscripref.h"\
 	"..\..\..\sword\include\thmlstrongs.h"\
 	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\treekey.h"\
-	"..\..\..\sword\include\treekeyidx.h"\
 	"..\..\..\sword\include\utf8cantillation.h"\
 	"..\..\..\sword\include\utf8greekaccents.h"\
 	"..\..\..\sword\include\utf8hebrewpoints.h"\
 	"..\..\..\sword\include\utf8transliterator.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\utilxml.h"\
 	"..\..\..\sword\include\zcom.h"\
 	"..\..\..\sword\include\zipcomprs.h"\
 	"..\..\..\sword\include\zld.h"\
@@ -11326,14 +10678,7 @@
 	"..\..\..\sword\include\ztext.h"\
 	"..\..\..\sword\include\zverse.h"\
 	".\winceSword\include\dirent.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_SWMGR=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11393,18 +10738,10 @@
 DEP_CPP_SWSEA=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWSEA=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11466,17 +10803,10 @@
 DEP_CPP_LISTK=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_LISTK=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11536,18 +10866,10 @@
 DEP_CPP_STRKE=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\strkey.h"\
-	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_STRKE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11601,17 +10923,10 @@
 
 DEP_CPP_SWKEY=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWKEY=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11673,17 +10988,10 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\treekey.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_TREEK=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11762,21 +11070,15 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\filemgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\sysdata.h"\
 	"..\..\..\sword\include\treekey.h"\
 	"..\..\..\sword\include\treekeyidx.h"\
 	"..\..\..\sword\include\utilstr.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_TREEKE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -11865,10 +11167,9 @@
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\localemgr.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
 	"..\..\..\sword\include\roman.h"\
+	"..\..\..\sword\include\stringmgr.h"\
 	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swlocale.h"\
 	"..\..\..\sword\include\swlog.h"\
@@ -11876,14 +11177,7 @@
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\utilstr.h"\
 	"..\..\..\sword\include\versekey.h"\
-	".\winceSword\include\unistd.h"\
 	
-NODEP_CPP_VERSE=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 
@@ -12033,19 +11327,11 @@
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\utilstr.h"\
 	
-NODEP_CPP_SWDIS=\
-	"..\..\..\sword\include\unixstr.h"\
-	"..\..\..\sword\include\utilconf.h"\
-	"..\..\..\sword\include\utilfuns.h"\
-	"..\..\..\sword\include\utilweb.h"\
-	
 
 !ENDIF 
 

Modified: trunk/src/SwRd.vcb
===================================================================
(Binary files differ)

Modified: trunk/src/SwRd.vco
===================================================================
(Binary files differ)

Modified: trunk/src/gui/Utils.h
===================================================================
--- trunk/src/gui/Utils.h	2007-10-16 00:20:36 UTC (rev 40)
+++ trunk/src/gui/Utils.h	2007-11-06 05:42:56 UTC (rev 41)
@@ -5,7 +5,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "swbuf.h"
+#include <swbuf.h>
 #include <string>
 #include <map>
 #include <vector>

Modified: trunk/src/gui/gui.vcl
===================================================================
--- trunk/src/gui/gui.vcl	2007-10-16 00:20:36 UTC (rev 40)
+++ trunk/src/gui/gui.vcl	2007-11-06 05:42:56 UTC (rev 41)
@@ -3,31 +3,9 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: gui - Win32 (WCE x86) Release--------------------
+--------------------Configuration: gui - Win32 (WCE x86) Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSPC1.tmp" with contents
-[
-corelibc.lib ..\Dll1\X86Rel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:no /pdb:"X86Rel/gui.pdb" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib /out:"X86Rel/gui.exe" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:windowsce,3.00 /MACHINE:IX86 
-.\X86Rel\ApplicationInterface.obj
-.\X86Rel\Main.obj
-.\X86Rel\NavBooks.obj
-.\X86Rel\NavChap.obj
-.\X86Rel\NavFind.obj
-.\X86Rel\Navigator.obj
-.\X86Rel\NavNumbers.obj
-.\X86Rel\NavRenderText.obj
-.\X86Rel\NavVerse.obj
-.\X86Rel\SimpleNavigator.obj
-.\X86Rel\SwordIndex.obj
-.\X86Rel\TextControl.obj
-.\X86Rel\Utils.obj
-.\X86Rel\VerseTextControl.obj
-.\X86Rel\BibleReader.res
-]
-Creating command line "link.exe @C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSPC1.tmp"
-<h3>Output Window</h3>
-Linking...
 
 
 

Modified: trunk/src/simplegui/simplegui.vcl
===================================================================
--- trunk/src/simplegui/simplegui.vcl	2007-10-16 00:20:36 UTC (rev 40)
+++ trunk/src/simplegui/simplegui.vcl	2007-11-06 05:42:56 UTC (rev 41)
@@ -3,40 +3,38 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: simplegui - Win32 (WCE ARM) Release--------------------
+--------------------Configuration: simplegui - Win32 (WCE x86) Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSP91.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSP2.tmp" with contents
 [
-..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:no /pdb:"ARMRel/simplegui.pdb" /nodefaultlib:"libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib" /out:"ARMRel/simplegui.exe" /libpath:"..\STL_eVC" /subsystem:windowsce,3.00 /align:"4096" /MACHINE:ARM 
-.\ARMRel\ApplicationInterface.obj
-.\ARMRel\Main.obj
-.\ARMRel\NavBooks.obj
-.\ARMRel\NavChap.obj
-.\ARMRel\NavFind.obj
-.\ARMRel\NavNumbers.obj
-.\ARMRel\NavRenderText.obj
-.\ARMRel\NavVerse.obj
-.\ARMRel\SimpleNavigator.obj
-.\ARMRel\SwordIndex.obj
-.\ARMRel\TextControl.obj
-.\ARMRel\Utils.obj
-.\ARMRel\VerseTextControl.obj
-.\ARMRel\simplegui.res
+corelibc.lib ..\Dll1\X86Dbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:yes /pdb:"X86Dbg/simplegui.pdb" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib /out:"X86Dbg/simplegui.exe" /libpath:"..\STL_eVC" /subsystem:windowsce,3.00 /MACHINE:IX86 
+.\X86Dbg\ApplicationInterface.obj
+.\X86Dbg\Main.obj
+.\X86Dbg\NavBooks.obj
+.\X86Dbg\NavChap.obj
+.\X86Dbg\NavFind.obj
+.\X86Dbg\NavNumbers.obj
+.\X86Dbg\NavRenderText.obj
+.\X86Dbg\NavVerse.obj
+.\X86Dbg\SimpleNavigator.obj
+.\X86Dbg\SwordIndex.obj
+.\X86Dbg\TextControl.obj
+.\X86Dbg\Utils.obj
+.\X86Dbg\VerseTextControl.obj
+.\X86Dbg\simplegui.res
 ]
-Creating command line "link.exe @C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSP91.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Scribe\LOCALS~1\Temp\RSP2.tmp"
 <h3>Output Window</h3>
 Linking...
-NavRenderText.obj : error LNK2019: unresolved external symbol "private: static char * sword::SWBuf::nullStr" (?nullStr at SWBuf@sword@@0PADA) referenced in function "private: void __cdecl NavRenderText::load(void)" (?load at NavRenderText@@AAAXXZ)
-SimpleNavigator.obj : error LNK2001: unresolved external symbol "private: static char * sword::SWBuf::nullStr" (?nullStr at SWBuf@sword@@0PADA)
-SwordIndex.obj : error LNK2019: unresolved external symbol "private: static char * sword::SWBuf::nullStr" (?nullStr at SWBuf@sword@@0PADA) referenced in function "public: __cdecl SwordIndex::SwordIndex(void)" (??0SwordIndex@@QAA at XZ)
-ARMRel/simplegui.exe : fatal error LNK1120: 1 unresolved externals
+Main.obj : error LNK2019: unresolved external symbol "public: __thiscall Navigator::Navigator(struct tagRECT *)" (??0Navigator@@QAE at PAUtagRECT@@@Z) referenced in function "long __cdecl WndProc(struct HWND__ *,unsigned int,unsigned int,long)" (?WndProc@@YAJPAUHWND__@@IIJ at Z)
+X86Dbg/simplegui.exe : fatal error LNK1120: 1 unresolved externals
 Error executing link.exe.
 
 
 
 <h3>Results</h3>
-simplegui.exe - 4 error(s), 0 warning(s)
+simplegui.exe - 2 error(s), 0 warning(s)
 </pre>
 </body>
 </html>

Modified: trunk/src/simplegui/simplegui.vcp
===================================================================
--- trunk/src/simplegui/simplegui.vcp	2007-10-16 00:20:36 UTC (rev 40)
+++ trunk/src/simplegui/simplegui.vcp	2007-11-06 05:42:56 UTC (rev 41)
@@ -52,7 +52,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SIMPLE" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /I "winceSword\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SIMPLE" /FR /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -85,7 +86,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -118,7 +120,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /Oxs /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /I "winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gs8192 /GF /Oxs /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -151,7 +154,8 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\Dll1\winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gs8192 /GF /c
+# SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -160,7 +164,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
-# ADD LINK32 $(CEx86Corelibc) ..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"..\STL_eVC" /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) ..\Dll1\X86Dbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"..\STL_eVC" /subsystem:$(CESubsystem) /MACHINE:IX86
 
 !ENDIF 
 
@@ -184,9 +188,11 @@
 	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Utils.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"sipapi.h"\
 	
+NODEP_CPP_APPLI=\
+	".\ipapi.h"\
+	".\ygshell.h"\
+	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
@@ -213,13 +219,13 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_APPLI=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Utils.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_APPLI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ENDIF 
 
@@ -260,10 +266,12 @@
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
 	"..\gui\Utils.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
-	{$(INCLUDE)}"sipapi.h"\
 	
+NODEP_CPP_MAIN_=\
+	".\ipapi.h"\
+	".\tmlctrl.h"\
+	".\ygshell.h"\
+	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
@@ -302,6 +310,28 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_MAIN_=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Main.h"\
 	"..\gui\Navigator.h"\
@@ -309,12 +339,10 @@
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
 	"..\gui\Utils.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_MAIN_=\
-	".\ipapi.h"\
-	".\tmlctrl.h"\
-	".\ygshell.h"\
-	
 
 !ENDIF 
 
@@ -383,9 +411,30 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_NAVBO=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavBooks.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
@@ -466,14 +515,36 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_NAVCH=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavChap.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -545,12 +616,34 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_NAVFI=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -621,8 +714,29 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_NAVNU=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
@@ -706,17 +820,38 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_NAVRE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
 	"..\gui\ApplicationInterface.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\NavRenderText.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	"..\gui\VerseTextControl.h"\
 	
-NODEP_CPP_NAVRE=\
-	".\tmlctrl.h"\
-	
 
 !ENDIF 
 
@@ -792,14 +927,36 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_NAVVE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\NavVerse.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -886,6 +1043,29 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_SIMPL=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavBooks.h"\
 	"..\gui\NavChap.h"\
@@ -896,7 +1076,9 @@
 	"..\gui\NavVerse.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	"..\gui\VerseTextControl.h"\
 	
 
 !ENDIF 
@@ -967,13 +1149,38 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_SWORD=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swlog.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
+	"..\Dll1\winceSword\include\swwinlog.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\SwordIndex.h"\
 	"..\gui\Utils.h"\
 	
-NODEP_CPP_SWORD=\
-	"..\gui\swwinlog.h"\
-	
 
 !ENDIF 
 
@@ -991,8 +1198,10 @@
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
 	
+NODEP_CPP_TEXTC=\
+	".\tmlctrl.h"\
+	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
@@ -1019,13 +1228,14 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_TEXTC=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
 	
-NODEP_CPP_TEXTC=\
-	".\tmlctrl.h"\
-	
 
 !ENDIF 
 
@@ -1057,6 +1267,8 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_UTILS=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -1077,8 +1289,10 @@
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	"..\gui\VerseTextControl.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
 	
+NODEP_CPP_VERSE=\
+	".\tmlctrl.h"\
+	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
@@ -1101,10 +1315,14 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
 DEP_CPP_VERSE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	"..\gui\VerseTextControl.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
 	
 
 !ENDIF 




More information about the sword-cvs mailing list