[sword-svn] r1685 - in trunk: . bindings include

[scribe at crosswire.org]

Author: scribe
Date: 2004-12-22 00:05:49 -0700 (Wed, 22 Dec 2004)
New Revision: 1685

Modified:
   trunk/bindings/flatapi.cpp
   trunk/include/flatapi.h
   trunk/usrinst.sh
Log:
Updated and cleaned up flat model


Modified: trunk/bindings/flatapi.cpp
===================================================================
--- trunk/bindings/flatapi.cpp	2004-12-17 18:53:59 UTC (rev 1684)
+++ trunk/bindings/flatapi.cpp	2004-12-22 07:05:49 UTC (rev 1685)
@@ -1,9 +1,25 @@
 /******************************************************************************
- *	swordapi.cpp	- This file contains an api usable by non-C++ windows
+ *	swordapi.cpp	- This file contains an api usable by non-C++
  *					environments
+ *
+ * $Id$
+ *
+ * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
  */
 
-#include <string.h>
 #include <stdio.h>
  
 #include <rawtext.h>

Modified: trunk/include/flatapi.h
===================================================================
--- trunk/include/flatapi.h	2004-12-17 18:53:59 UTC (rev 1684)
+++ trunk/include/flatapi.h	2004-12-22 07:05:49 UTC (rev 1685)
@@ -1,10 +1,28 @@
+/******************************************************************************
+ *	swordapi.h	- This file contains an api usable by non-C++
+ *					environments
+ *
+ * $Id$
+ *
+ * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
 #ifndef SWORDAPI_H
 #define SWORDAPI_H
 
-//#include <swmodule.h>
-//#include <swkey.h>
-//#include <versekey.h>
-//#include <swmgr.h>
 #include <defs.h>
 #ifdef __cplusplus
 #endif
@@ -13,7 +31,6 @@
 
 #define SWHANDLE long
 
-//using namespace sword;
 
 //-----------------------------------------------------------------
 // stringlist_iterator methods

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2004-12-17 18:53:59 UTC (rev 1684)
+++ trunk/usrinst.sh	2004-12-22 07:05:49 UTC (rev 1685)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 OPTIONS="--prefix=/usr $OPTIONS"
-OPTIONS="--disable-shared $OPTIONS"
+#OPTIONS="--disable-shared $OPTIONS"
 OPTIONS="--without-conf $OPTIONS"
 OPTIONS="--sysconfdir=/etc $OPTIONS"
 #OPTIONS="--with-icu $OPTIONS"
 #OPTIONS="--with-vcl $OPTIONS"
-OPTIONS="--enable-debug $OPTIONS"
+#OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
 #OPTIONS="--with-lucene $OPTIONS"
 #OPTIONS="--enable-tests $OPTIONS"