[sword-cvs]
swordreader/src/Dll1 Dll1.vcl, 1.17, 1.18 Dll1.vcp, 1.7, 1.8
sword at www.crosswire.org
sword at www.crosswire.org
Sat Jul 24 08:28:03 MST 2004
Committed by: jgorter
Update of /cvs/core/swordreader/src/Dll1
In directory www:/tmp/cvs-serv21072/src/Dll1
Modified Files:
Dll1.vcl Dll1.vcp
Log Message:
- integrated HTML verseText component
- goto-button on search page works
Index: Dll1.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/Dll1/Dll1.vcl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Dll1.vcl 17 Apr 2004 18:54:59 -0000 1.17
+++ Dll1.vcl 24 Jul 2004 15:28:00 -0000 1.18
@@ -6,13 +6,13 @@
--------------------Configuration: Dll1 - Win32 (WCE ARM) Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP7.tmp" with contents
+Creating temporary file "F:\DOCUME~1\Johan\LOCALS~1\Temp\RSP42.tmp" with contents
[
/nologo /W3 /I "..\..\..\sword\include" /I "winceSword\include" /I "..\STL_eVC" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "DEBUG" /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "_i386_" /D UNDER_CE=300 /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "DLL1_EXPORTS" /D "SWMAKINGDLL" /U "USE_AUTOTOOLS" /U "__GNUC__" /U "_ICU_" /FR"ARMRel/" /Fp"ARMRel/Dll1.pch" /YX /Fo"ARMRel/" /Oxs /MC /c
-"D:\SwordReader\sword\src\modules\filters\osisosis.cpp"
+"F:\SwordReader\sword\src\utilfuns\url.cpp"
]
-Creating command line "clarm.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP7.tmp"
-Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP8.tmp" with contents
+Creating command line "clarm.exe @F:\DOCUME~1\Johan\LOCALS~1\Temp\RSP42.tmp"
+Creating temporary file "F:\DOCUME~1\Johan\LOCALS~1\Temp\RSP43.tmp" with contents
[
commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /incremental:no /pdb:"ARMRel/sword.pdb" /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:"ARMRel/sword.lib" /subsystem:windowsce,3.00 /align:"4096" /MACHINE:ARM
.\ARMRel\adler32.obj
@@ -76,6 +76,7 @@
.\ARMRel\osishtmlhref.obj
.\ARMRel\osislemma.obj
.\ARMRel\osismorph.obj
+.\ARMRel\osisosis.obj
.\ARMRel\osisplain.obj
.\ARMRel\osisredletterwords.obj
.\ARMRel\osisrtf.obj
@@ -148,32 +149,24 @@
.\ARMRel\swordce.obj
.\ARMRel\swwinlog.obj
.\ARMRel\unistd.obj
-.\ARMRel\osisosis.obj
+.\ARMRel\stringmgr.obj
+.\ARMRel\url.obj
]
-Creating command line "link.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP8.tmp"
+Creating command line "link.exe @F:\DOCUME~1\Johan\LOCALS~1\Temp\RSP43.tmp"
<h3>Output Window</h3>
Compiling...
-osisosis.cpp
-..\..\..\sword\include\swbuf.h(208) : warning C4018: '<' : signed/unsigned mismatch
-..\..\..\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(41) : see declaration of 'SWObject'
-..\..\..\sword\include\swbasicfilter.h(93) : warning C4251: 'tokenSubMap' : 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::SWBasicFilter'
-..\..\..\sword\include\swbasicfilter.h(94) : warning C4251: 'escSubMap' : 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::SWBasicFilter'
-..\..\..\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\versekey.h(105) : 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(75) : see declaration of 'LocaleCache'
-..\..\..\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(41) : see declaration of 'SWObject'
-..\..\..\sword\include\swconfig.h(53) : 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(88) : 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(90) : 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'
+url.cpp
+..\..\..\sword\include\swbuf.h(283) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
+..\..\..\sword\include\swbuf.h(291) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
+F:\SwordReader\sword\src\utilfuns\url.cpp(214) : warning C4244: 'argument' : conversion from 'unsigned short' to 'const unsigned char', possible loss of data
Linking...
Creating library ARMRel/sword.lib and object ARMRel/sword.exp
+
<h3>Results</h3>
-sword.dll - 0 error(s), 10 warning(s)
+sword.dll - 0 error(s), 3 warning(s)
</pre>
</body>
</html>
Index: Dll1.vcp
===================================================================
RCS file: /cvs/core/swordreader/src/Dll1/Dll1.vcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Dll1.vcp 17 Apr 2004 18:54:59 -0000 1.7
+++ Dll1.vcp 24 Jul 2004 15:28:00 -0000 1.8
@@ -114,21 +114,21 @@
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE 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
-# 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
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
[...1277 lines suppressed...]
# Begin Source File
+SOURCE=..\..\..\sword\include\stringmgr.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\sword\include\strkey.h
# End Source File
# Begin Source File
@@ -11847,6 +12124,10 @@
# Begin Source File
SOURCE=..\..\..\sword\include\untgz.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\sword\include\url.h
# End Source File
# Begin Source File
More information about the sword-cvs
mailing list