[sword-cvs] swordreader/src/gui BibleReader.aps,1.1.1.1,1.2 SwordIndex.cpp,1.5,1.6 gui.vcl,1.6,1.7 gui.vcp,1.3,1.4

sword@www.crosswire.org sword@www.crosswire.org
Tue, 20 Jan 2004 23:15:35 -0700


Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv16861/src/gui

Modified Files:
	BibleReader.aps SwordIndex.cpp gui.vcl gui.vcp 
Log Message:
no message

Index: BibleReader.aps
===================================================================
RCS file: /cvs/core/swordreader/src/gui/BibleReader.aps,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsTz1HZf and /tmp/cvsrDAz1P differ

Index: SwordIndex.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SwordIndex.cpp	18 Jan 2004 01:03:23 -0000	1.5
+++ SwordIndex.cpp	21 Jan 2004 06:15:33 -0000	1.6
@@ -5,6 +5,8 @@
 #include "ApplicationInterface.h"
 #include "SwordIndex.h"
 #include <markupfiltmgr.h>
+#include <swordce.h>
+#include "swwinlog.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -66,10 +68,10 @@
 //			WriteFile(newConf,line2.c_str(),line2.length(),&check,NULL);
 //			CloseHandle(newConf);
 //		}
-
 		texts=new ModuleMap();
 		__try {
 			manager=new sword::SWMgr(new sword::MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16));
+//			manager->augmentModules("/SD Card");
 			//get the available bibles out of here
 
 //			manager=new sword::SWMgr(swordConfigDir,true, new sword::SWFilterMgr());

Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gui.vcl	18 Jan 2004 07:00:29 -0000	1.6
+++ gui.vcl	21 Jan 2004 06:15:33 -0000	1.7
@@ -7,7 +7,7 @@
 </h3>
 <h3>Command Lines</h3>
 Creating command line "rc.exe /l 0x409 /fo"X86Dbg/BibleReader.res" /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /d UNDER_CE=300 /d _WIN32_WCE=300 /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "WIN32_PLATFORM_PSPC=310" /d "_X86_" /d "x86" /d "_i386_" /r "D:\src\swordreader\src\gui\BibleReader.rc"" 
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9C.tmp" with contents
+Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9A.tmp" with contents
 [
 /nologo /W3 /Zi /Od /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /D "DEBUG" /D "_i386_" /D UNDER_CE=300 /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /FR"X86Dbg/" /Fp"X86Dbg/gui.pch" /YX /Fo"X86Dbg/" /Fd"X86Dbg/" /Gs8192 /GF /c 
 "D:\src\swordreader\src\gui\ApplicationInterface.cpp"
@@ -19,8 +19,8 @@
 "D:\src\swordreader\src\gui\SwordIndex.cpp"
 "D:\src\swordreader\src\gui\Utils.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9C.tmp" 
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9D.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9A.tmp" 
+Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9B.tmp" with contents
 [
 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/gui.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/gui.exe" /subsystem:windowsce,3.00 /MACHINE:IX86 
 .\X86Dbg\ApplicationInterface.obj
@@ -33,7 +33,7 @@
 .\X86Dbg\Utils.obj
 .\X86Dbg\BibleReader.res
 ]
-Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9D.tmp"
+Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP9B.tmp"
 <h3>Output Window</h3>
 Compiling resources...
 Compiling...

Index: gui.vcp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gui.vcp	18 Jan 2004 01:03:23 -0000	1.3
+++ gui.vcp	21 Jan 2004 06:15:33 -0000	1.4
@@ -52,7 +52,7 @@
 # ADD RSC /l 0x409 /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /i "..\STL_eVC" /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 "..\dll1\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" /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" /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -61,7 +61,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib ..\Dll1\ARMRel\sword.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /out:"../../gui.exe" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 ..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib ..\Dll1\ARMRel\sword.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
 
@@ -118,7 +118,7 @@
 # ADD RSC /l 0x409 /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /i "..\STL_eVC" /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 /I "..\STL_eVC" /I "..\dll1\sword\include" /I "..\dll1\wincesword\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" /YX /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\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" /YX /Gs8192 /GF /Oxs /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -127,7 +127,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" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
-# ADD LINK32 $(CEx86Corelibc) htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) ..\Dll1\X86Rel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:$(CESubsystem) /MACHINE:IX86
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Debug"
 
@@ -191,8 +191,10 @@
 DEP_CPP_APPLI=\
 	".\ApplicationInterface.h"\
 	".\Utils.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"sipapi.h"\
+	
+NODEP_CPP_APPLI=\
+	".\ipapi.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -200,8 +202,10 @@
 DEP_CPP_APPLI=\
 	".\ApplicationInterface.h"\
 	".\Utils.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"sipapi.h"\
+	
+NODEP_CPP_APPLI=\
+	".\ipapi.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -223,6 +227,38 @@
 !IF  "$(CFG)" == "gui - Win32 (WCE ARM) Release"
 
 DEP_CPP_MAIN_=\
+	"..\..\..\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\swbasicfilter.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\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\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\unixstr.h"\
+	"..\..\..\sword\include\utilconf.h"\
+	"..\..\..\sword\include\utilfuns.h"\
+	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilweb.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	".\ApplicationInterface.h"\
 	".\Main.h"\
 	".\Navigator.h"\
@@ -240,8 +276,10 @@
 	".\Navigator.h"\
 	".\SwordIndex.h"\
 	".\Utils.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"sipapi.h"\
+	
+NODEP_CPP_MAIN_=\
+	".\ipapi.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -252,8 +290,10 @@
 	".\Navigator.h"\
 	".\SwordIndex.h"\
 	".\Utils.h"\
-	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"sipapi.h"\
+	
+NODEP_CPP_MAIN_=\
+	".\ipapi.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -310,6 +350,38 @@
 !IF  "$(CFG)" == "gui - Win32 (WCE ARM) Release"
 
 DEP_CPP_NAVBO=\
+	"..\..\..\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\swbasicfilter.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\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\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\unixstr.h"\
+	"..\..\..\sword\include\utilconf.h"\
+	"..\..\..\sword\include\utilfuns.h"\
+	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilweb.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	".\ApplicationInterface.h"\
 	".\NavBooks.h"\
 	".\Navigator.h"\
@@ -389,6 +461,38 @@
 !IF  "$(CFG)" == "gui - Win32 (WCE ARM) Release"
 
 DEP_CPP_NAVIG=\
+	"..\..\..\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\swbasicfilter.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\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\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\unixstr.h"\
+	"..\..\..\sword\include\utilconf.h"\
+	"..\..\..\sword\include\utilfuns.h"\
+	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilweb.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	".\ApplicationInterface.h"\
 	".\NavBooks.h"\
 	".\Navigator.h"\
@@ -476,6 +580,38 @@
 !IF  "$(CFG)" == "gui - Win32 (WCE ARM) Release"
 
 DEP_CPP_NAVNU=\
+	"..\..\..\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\swbasicfilter.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\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\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\unixstr.h"\
+	"..\..\..\sword\include\utilconf.h"\
+	"..\..\..\sword\include\utilfuns.h"\
+	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilweb.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	".\ApplicationInterface.h"\
 	".\Navigator.h"\
 	".\NavNumbers.h"\
@@ -555,6 +691,38 @@
 !IF  "$(CFG)" == "gui - Win32 (WCE ARM) Release"
 
 DEP_CPP_NAVRE=\
+	"..\..\..\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\swbasicfilter.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\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\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\unixstr.h"\
+	"..\..\..\sword\include\utilconf.h"\
+	"..\..\..\sword\include\utilfuns.h"\
+	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilweb.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	".\ApplicationInterface.h"\
 	".\Navigator.h"\
 	".\NavRenderText.h"\
@@ -571,7 +739,9 @@
 	".\NavRenderText.h"\
 	".\SwordIndex.h"\
 	".\Utils.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
+	
+NODEP_CPP_NAVRE=\
+	".\tmlctrl.h"\
 	
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -582,7 +752,9 @@
 	".\NavRenderText.h"\
 	".\SwordIndex.h"\
 	".\Utils.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
+	
+NODEP_CPP_NAVRE=\
+	".\tmlctrl.h"\
 	
 
 !ELSEIF  "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -638,8 +810,44 @@
 !IF  "$(CFG)" == "gui - Win32 (WCE ARM) Release"
 
 DEP_CPP_SWORD=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
+	"..\..\..\sword\include\filemgr.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\rawstr.h"\
+	"..\..\..\sword\include\rawverse.h"\
+	"..\..\..\sword\include\swbasicfilter.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\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\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\unixstr.h"\
+	"..\..\..\sword\include\utilconf.h"\
+	"..\..\..\sword\include\utilfuns.h"\
+	"..\..\..\sword\include\utilstr.h"\
+	"..\..\..\sword\include\utilweb.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
 	".\ApplicationInterface.h"\
 	".\SwordIndex.h"\
+	".\swwinlog.h"\
 	".\Utils.h"\
 	
 
@@ -696,6 +904,7 @@
 	"..\..\..\sword\include\versekey.h"\
 	"..\..\..\sword\include\ztext.h"\
 	"..\..\..\sword\include\zverse.h"\
+	"..\Dll1\winceSword\include\swordce.h"\
 	".\ApplicationInterface.h"\
 	".\SwordIndex.h"\
 	".\Utils.h"\