[sword-svn] r155 - in trunk/src: Dll1 SwordReader_GUI

[dtrotzjr at www.crosswire.org]

Author: dtrotzjr
Date: 2008-07-22 21:13:46 -0700 (Tue, 22 Jul 2008)
New Revision: 155

Modified:
   trunk/src/Dll1/Dll1.vcproj
   trunk/src/SwordReader_GUI/SRFind.cpp
   trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
Log:
Fixed minor compile time issues with the latest subversion. Hold off on this until Troy accepts my patch for the compiler errors I fixed.

Modified: trunk/src/Dll1/Dll1.vcproj
===================================================================
--- trunk/src/Dll1/Dll1.vcproj	2008-07-22 03:00:10 UTC (rev 154)
+++ trunk/src/Dll1/Dll1.vcproj	2008-07-23 04:13:46 UTC (rev 155)
@@ -636,7 +636,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory=""
+				RemoteDirectory="\Storage Card\Program Files\Sword\"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -12255,6 +12255,10 @@
 							/>
 						</FileConfiguration>
 					</File>
+					<File
+						RelativePath="..\..\..\sword\src\mgr\versemgr.cpp"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="keys"
@@ -13626,6 +13630,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\sword\include\versemgr.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\sword\include\zcom.h"
 					>
 				</File>

Modified: trunk/src/SwordReader_GUI/SRFind.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRFind.cpp	2008-07-22 03:00:10 UTC (rev 154)
+++ trunk/src/SwordReader_GUI/SRFind.cpp	2008-07-23 04:13:46 UTC (rev 155)
@@ -365,8 +365,8 @@
                     BIBLE_NT_BOOKS :
                     BIBLE_OT_BOOKS);
 
-	to.Chapter(to.books[to.Testament() - 1][to.Book() - 1].chapmax);
-	to.Verse(to.books[to.Testament() - 1][to.Book() - 1].versemax[to.Chapter() - 1]);
+    to.Chapter(/*to.books[to.Testament() - 1][to.Book() - 1].chapmax*/to.getChapterMax());
+    to.Verse(/*to.books[to.Testament() - 1][to.Book() - 1].versemax[to.Chapter() - 1]*/to.getVerseMax());
 
 	VerseKey verses(from,to);
 	sword::ListKey results;

Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2008-07-22 03:00:10 UTC (rev 154)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2008-07-23 04:13:46 UTC (rev 155)
@@ -223,7 +223,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory=""
+				RemoteDirectory="\Storage Card\Program Files\Sword\"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>