summaryrefslogtreecommitdiff
path: root/utilities
diff options
context:
space:
mode:
authorRoberto C. Sanchez <roberto@connexer.com>2014-03-29 10:54:04 -0400
committerRoberto C. Sanchez <roberto@connexer.com>2014-03-29 10:54:04 -0400
commitb745315323de9f27538edac9453205ca70e6186e (patch)
treee804cd15cf894a2a14aab6c5224bc242273dc3ba /utilities
parent936d9e8484ff73282c8c0a277310d1ffdde86e10 (diff)
Imported Upstream version 1.6.2+dfsg
Diffstat (limited to 'utilities')
-rw-r--r--utilities/CMakeLists.txt119
-rw-r--r--utilities/Makefile.in23
-rw-r--r--utilities/addgb.cpp5
-rw-r--r--utilities/addld.cpp4
-rw-r--r--utilities/addvs.cpp4
-rw-r--r--utilities/cipherraw.cpp5
-rw-r--r--utilities/diatheke/Makefile.in19
-rw-r--r--utilities/diatheke/diatheke.vcproj8
-rw-r--r--utilities/emptyvss.cpp4
-rw-r--r--utilities/genbookutil.cpp5
-rw-r--r--utilities/imp2gbs.cpp10
-rw-r--r--utilities/imp2ld.cpp6
-rw-r--r--utilities/imp2vs.cpp13
-rw-r--r--utilities/installmgr.cpp8
-rw-r--r--utilities/mkfastmod.cpp5
-rw-r--r--utilities/mod2imp.cpp4
-rw-r--r--utilities/mod2osis.cpp6
-rw-r--r--utilities/mod2vpl.cpp5
-rw-r--r--utilities/mod2zmod.cpp5
-rw-r--r--utilities/modwrite.cpp4
-rw-r--r--utilities/osis2mod.cpp79
-rw-r--r--utilities/step2vpl.cpp5
-rw-r--r--utilities/stepdump.cpp5
-rw-r--r--utilities/tei2mod.cpp4
-rw-r--r--utilities/treeidxutil.cpp4
-rw-r--r--utilities/vcppmake/addgb.vcproj4
-rw-r--r--utilities/vcppmake/addld.vcproj4
-rw-r--r--utilities/vcppmake/addvs.vcproj4
-rw-r--r--utilities/vcppmake/cipherraw.vcproj4
-rw-r--r--utilities/vcppmake/emptyvss.vcproj4
-rw-r--r--utilities/vcppmake/genbookutil.vcproj4
-rw-r--r--utilities/vcppmake/imp2gbs.vcproj4
-rw-r--r--utilities/vcppmake/imp2ld.vcproj4
-rw-r--r--utilities/vcppmake/imp2vs.vcproj4
-rw-r--r--utilities/vcppmake/installmgr.vcproj4
-rw-r--r--utilities/vcppmake/mkfastmod.vcproj4
-rw-r--r--utilities/vcppmake/mod2imp.vcproj4
-rw-r--r--utilities/vcppmake/mod2osis.vcproj4
-rw-r--r--utilities/vcppmake/mod2vpl.vcproj4
-rw-r--r--utilities/vcppmake/mod2zmod.vcproj4
-rw-r--r--utilities/vcppmake/modwrite.vcproj4
-rw-r--r--utilities/vcppmake/osis2mod.vcproj19
-rw-r--r--utilities/vcppmake/step2vpl.vcproj4
-rw-r--r--utilities/vcppmake/stepdump.vcproj4
-rw-r--r--utilities/vcppmake/tei2mod.vcproj4
-rw-r--r--utilities/vcppmake/treeidxutil.vcproj4
-rw-r--r--utilities/vcppmake/vpl2mod.vcproj4
-rw-r--r--utilities/vcppmake/vs2osisref.vcproj4
-rw-r--r--utilities/vcppmake/vs2osisreftxt.vcproj4
-rw-r--r--utilities/vcppmake/xml2gbs.vcproj4
-rw-r--r--utilities/vpl2mod.cpp5
-rw-r--r--utilities/vs2osisref.cpp5
-rw-r--r--utilities/vs2osisreftxt.cpp5
-rw-r--r--utilities/xml2gbs.cpp4
54 files changed, 370 insertions, 123 deletions
diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
new file mode 100644
index 0000000..3d510f1
--- /dev/null
+++ b/utilities/CMakeLists.txt
@@ -0,0 +1,119 @@
+######################################################################
+# Basic utility programs and their joy.
+#
+# The general assumption is that each of these utilities is built from
+# a single source file, which shares its name with the utility itself (appended with .cpp),
+# and then linked against the SWORD library.
+#
+# This list will be built and installed, if so chosen
+#
+# These are in alphbetical order now - please keep them that way
+# if you edit this list in the future.
+#
+SET(install_UTILITIES
+ addld
+ imp2gbs
+ imp2ld
+ imp2vs
+ installmgr
+ mkfastmod
+ mod2imp
+ mod2osis
+ mod2vpl
+ tei2mod
+ vpl2mod
+ vs2osisref
+ vs2osisreftxt
+ xml2gbs
+ osis2mod
+)
+
+IF(WITH_ZLIB OR WITH_INTERNAL_ZLIB)
+ SET(install_UTILITIES ${install_UTILITIES} mod2zmod)
+ENDIF(WITH_ZLIB OR WITH_INTERNAL_ZLIB)
+
+######################################################################
+# These utilities will be built, but they will not be installed
+#
+# Again, I have gone to great lengths of travail to make this list
+# alphabetical. If you add utilities to this list, please do so in a
+# way that maintains this.
+SET(noinstall_UTILITIES
+ addgb
+ addvs
+ cipherraw
+ emptyvss
+ gbfidx
+ genbookutil
+ modwrite
+ step2vpl
+ stepdump
+ treeidxutil
+)
+
+#####################################################################
+# This will loop over both of the above utility lists and add build targets
+# to the system for each one of them.
+#
+
+FOREACH(UTIL ${install_UTILITIES} ${noinstall_UTILITIES})
+ ADD_EXECUTABLE("${UTIL}" "${UTIL}.cpp")
+ IF(BUILDING_SHARED)
+ TARGET_LINK_LIBRARIES("${UTIL}" sword)
+ ELSE(BUILDING_SHARED)
+ TARGET_LINK_LIBRARIES("${UTIL}" sword_static)
+ ENDIF(BUILDING_SHARED)
+ENDFOREACH(UTIL ${install_UTILITIES})
+
+####################################################################
+# Just to be difficult, we have a single C file that is a utility
+# and, therefore, needs its own treatment.
+#
+
+ADD_EXECUTABLE(lexdump lexdump.c)
+IF(BUILDING_SHARED)
+ TARGET_LINK_LIBRARIES(lexdump sword)
+ELSE(BUILDING_SHARED)
+ TARGET_LINK_LIBRARIES(lexdump sword_static)
+ENDIF(BUILDING_SHARED)
+
+####################################################################
+# Install the utilities
+#
+# We do this here, rather than up in the main install file, because
+# a) it fits more logically and b) the scope of ${install_UTILITIES}
+# is limited to CMake files in this directory and below, so rather than
+# replicate the above list in another place, we'll just handle our
+# own install, since this whole directory is optional, anyway.
+#
+FOREACH(UTIL ${install_UTILITIES})
+ INSTALL(TARGETS ${UTIL}
+ DESTINATION ${SWORD_INSTALL_DIR}/bin
+ COMPONENT utilities
+ )
+ENDFOREACH(UTIL ${install_UTILITIES})
+
+####################################################################
+# And, of course, diatheke is a beast unto itself
+#
+# Let's go!
+#
+ADD_EXECUTABLE(diatheke
+ diatheke/diatheke.cpp
+ diatheke/corediatheke.cpp
+ diatheke/diathekemgr.cpp
+ diatheke/diafiltmgr.cpp
+ diatheke/thmlcgi.cpp
+ diatheke/gbfcgi.cpp
+ diatheke/osiscgi.cpp
+)
+IF(BUILDING_SHARED)
+ TARGET_LINK_LIBRARIES(diatheke sword)
+ELSE(BUILDING_SHARED)
+ TARGET_LINK_LIBRARIES(diatheke sword_static)
+ENDIF(BUILDING_SHARED)
+INSTALL(TARGETS diatheke
+ DESTINATION ${SWORD_INSTALL_DIR}/bin
+ COMPONENT utilities
+)
+
diff --git a/utilities/Makefile.in b/utilities/Makefile.in
index 68910d3..e305d52 100644
--- a/utilities/Makefile.in
+++ b/utilities/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,7 +53,9 @@ subdir = utilities
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
$(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -284,14 +286,13 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
GENCCODE = @GENCCODE@
GENCMN = @GENCMN@
GENRB = @GENRB@
@@ -305,18 +306,23 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -338,7 +344,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -372,6 +378,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -714,7 +721,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -739,7 +746,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/utilities/addgb.cpp b/utilities/addgb.cpp
index 50be73a..41c99fa 100644
--- a/utilities/addgb.cpp
+++ b/utilities/addgb.cpp
@@ -14,6 +14,11 @@
* General Public License for more details.
*
*/
+
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/utilities/addld.cpp b/utilities/addld.cpp
index e6b8872..0f9a0f2 100644
--- a/utilities/addld.cpp
+++ b/utilities/addld.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/utilities/addvs.cpp b/utilities/addvs.cpp
index 499ee54..02f34fa 100644
--- a/utilities/addvs.cpp
+++ b/utilities/addvs.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/utilities/cipherraw.cpp b/utilities/cipherraw.cpp
index 026e06d..1d0df9c 100644
--- a/utilities/cipherraw.cpp
+++ b/utilities/cipherraw.cpp
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in
index 6139bb3..6d35bb2 100644
--- a/utilities/diatheke/Makefile.in
+++ b/utilities/diatheke/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43,7 +43,9 @@ subdir = utilities/diatheke
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
$(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -107,14 +109,13 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
GENCCODE = @GENCCODE@
GENCMN = @GENCMN@
GENRB = @GENRB@
@@ -128,18 +129,23 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -161,7 +167,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -195,6 +201,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/utilities/diatheke/diatheke.vcproj b/utilities/diatheke/diatheke.vcproj
index 6b2b2ed..3aa55b9 100644
--- a/utilities/diatheke/diatheke.vcproj
+++ b/utilities/diatheke/diatheke.vcproj
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../include/internal/regex"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;SWUSINGDLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -137,7 +137,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../include/internal/regex"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;SWUSINGDLL"
StringPooling="true"
RuntimeLibrary="2"
@@ -227,7 +227,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include,../../include/internal/regex"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -320,7 +320,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
+ AdditionalIncludeDirectories="../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
StringPooling="true"
RuntimeLibrary="2"
diff --git a/utilities/emptyvss.cpp b/utilities/emptyvss.cpp
index 61a1b6c..705eb90 100644
--- a/utilities/emptyvss.cpp
+++ b/utilities/emptyvss.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <swmgr.h>
#include <swmodule.h>
#include <versekey.h>
diff --git a/utilities/genbookutil.cpp b/utilities/genbookutil.cpp
index 61b4821..03c19b3 100644
--- a/utilities/genbookutil.cpp
+++ b/utilities/genbookutil.cpp
@@ -15,11 +15,16 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <entriesblk.h>
#include <iostream>
#include <stdio.h>
#include <treekeyidx.h>
#include <rawgenbook.h>
+
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
diff --git a/utilities/imp2gbs.cpp b/utilities/imp2gbs.cpp
index ba6a222..b8edbb4 100644
--- a/utilities/imp2gbs.cpp
+++ b/utilities/imp2gbs.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
@@ -30,17 +34,13 @@
#include <stringmgr.h>
#ifdef _ICU_
-
#include <unicode/utypes.h>
#include <unicode/ucnv.h>
#include <unicode/ustring.h>
#include <unicode/uchar.h>
-
#include <unicode/unistr.h>
#include <unicode/translit.h>
-
#include <unicode/locid.h>
-
#endif
#ifndef NO_SWORD_NAMESPACE
@@ -239,7 +239,7 @@ int main(int argc, char **argv) {
bool more = true;
do {
- more = FileMgr::getLine(fd, lineBuffer);
+ more = FileMgr::getLine(fd, lineBuffer)!=0;
if (lineBuffer.startsWith("$$$")) {
if ((keyBuffer.size()) && (entBuffer.size())) {
writeEntry(book, keyBuffer, entBuffer);
diff --git a/utilities/imp2ld.cpp b/utilities/imp2ld.cpp
index 11f5d6b..ec2fcf6 100644
--- a/utilities/imp2ld.cpp
+++ b/utilities/imp2ld.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <string>
#include <vector>
#include <fstream>
@@ -28,9 +32,7 @@
using std::string;
#ifndef NO_SWORD_NAMESPACE
-
using namespace sword;
-
#endif
diff --git a/utilities/imp2vs.cpp b/utilities/imp2vs.cpp
index 75d5dae..35c9382 100644
--- a/utilities/imp2vs.cpp
+++ b/utilities/imp2vs.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <stdio.h>
#include <iostream>
@@ -143,9 +147,11 @@ int main(int argc, char **argv) {
exit(-1);
}
}
- if (!fourByteSize)
- RawText::createModule(outPath, v11n);
- else RawText4::createModule(outPath, v11n);
+ else {
+ if (!fourByteSize)
+ RawText::createModule(outPath, v11n);
+ else RawText4::createModule(outPath, v11n);
+ }
}
SWModule *module = 0;
@@ -206,6 +212,7 @@ int main(int argc, char **argv) {
FileMgr::getSystemFileMgr()->close(fd);
+ delete module;
delete vkey;
return 0;
diff --git a/utilities/installmgr.cpp b/utilities/installmgr.cpp
index a56aa37..18a6895 100644
--- a/utilities/installmgr.cpp
+++ b/utilities/installmgr.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <swmgr.h>
#include <installmgr.h>
#include <ftptrans.h>
@@ -78,7 +82,7 @@ virtual bool isUserDisclaimerConfirmed() const {
class MyStatusReporter : public StatusReporter {
int last;
virtual void statusUpdate(double dltotal, double dlnow) {
- int p = 74 * (dlnow / dltotal);
+ int p = 74 * (int)(dlnow / dltotal);
for (;last < p; ++last) {
if (!last) {
SWBuf output;
@@ -97,7 +101,7 @@ class MyStatusReporter : public StatusReporter {
while (output.size() < 75) output += " ";
output += "]";
cout << "\n" << output.c_str() << "\n ";
- int p = 74 * ((double)completedBytes/totalBytes);
+ int p = 74 * (int)((double)completedBytes/totalBytes);
for (int i = 0; i < p; ++i) { cout << "="; }
cout << "\n\n" << message << "\n";
last = 0;
diff --git a/utilities/mkfastmod.cpp b/utilities/mkfastmod.cpp
index 8e0aaf2..3c5ff8a 100644
--- a/utilities/mkfastmod.cpp
+++ b/utilities/mkfastmod.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <stdio.h>
#include <rawtext.h>
#include <swmgr.h>
@@ -22,7 +26,6 @@
#include <markupfiltmgr.h>
#include <swbuf.h>
-
#ifndef NO_SWORD_NAMESPACE
using sword::SWMgr;
using sword::SWModule;
diff --git a/utilities/mod2imp.cpp b/utilities/mod2imp.cpp
index 0a108f9..1a12c72 100644
--- a/utilities/mod2imp.cpp
+++ b/utilities/mod2imp.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <iostream>
#include <map>
#include <stdio.h>
diff --git a/utilities/mod2osis.cpp b/utilities/mod2osis.cpp
index 087300c..ef71704 100644
--- a/utilities/mod2osis.cpp
+++ b/utilities/mod2osis.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <fcntl.h>
#include <iostream>
#include <fstream>
@@ -114,7 +118,7 @@ int main(int argc, char **argv)
cout << "<osis";
cout << " xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\"";
cout << " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
- cout << " xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace osisCore.2.5.xsd\">\n\n";
+ cout << " xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.2.1.1.xsd\">\n\n";
cout << "<osisText";
cout << " osisIDWork=\"";
cout << inModule->Name() << "\"";
diff --git a/utilities/mod2vpl.cpp b/utilities/mod2vpl.cpp
index 09ec053..ead9e6c 100644
--- a/utilities/mod2vpl.cpp
+++ b/utilities/mod2vpl.cpp
@@ -15,12 +15,17 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <swmgr.h>
#include <swmodule.h>
#include <swkey.h>
#include <versekey.h>
#include <stdio.h>
#include <iostream>
+
#ifndef NO_SWORD_NAMESPACE
using sword::SWMgr;
using sword::VerseKey;
diff --git a/utilities/mod2zmod.cpp b/utilities/mod2zmod.cpp
index 2e5be31..2ef4963 100644
--- a/utilities/mod2zmod.cpp
+++ b/utilities/mod2zmod.cpp
@@ -17,6 +17,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <fcntl.h>
#include <iostream>
#include <fstream>
@@ -39,7 +43,6 @@
#include <stdio.h>
#include <cipherfil.h>
-
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
diff --git a/utilities/modwrite.cpp b/utilities/modwrite.cpp
index 74f123e..87891a1 100644
--- a/utilities/modwrite.cpp
+++ b/utilities/modwrite.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <fcntl.h>
#include <iostream>
#include <fstream>
diff --git a/utilities/osis2mod.cpp b/utilities/osis2mod.cpp
index 3dea0c4..7b937fd 100644
--- a/utilities/osis2mod.cpp
+++ b/utilities/osis2mod.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
@@ -452,7 +456,7 @@ void makeValidRef(VerseKey &key) {
void writeEntry(SWBuf &text, bool force = false) {
char keyOsisID[255];
- static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 2478 $\"/>";
+ static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 2562 $\"/>";
static bool firstOT = true;
static bool firstNT = true;
@@ -586,7 +590,7 @@ bool handleToken(SWBuf &text, XMLTag token) {
// Flags indicating whether we are processing the content of to be prepended to a verse
static bool inPreVerse = false;
- static int genID = 1;
+// static int genID = 1;
// Flag indicating whether we are in "Words of Christ"
static bool inWOC = false;
@@ -765,9 +769,9 @@ bool handleToken(SWBuf &text, XMLTag token) {
// Did we have pre-verse material that needs to be marked?
if (inPreVerse) {
- char genBuf[200];
- sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" eID=\"pv%d\"/>", genID++);
- text.append(genBuf);
+// char genBuf[200];
+// sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" eID=\"pv%d\"/>", genID++);
+// text.append(genBuf);
}
// Get osisID for verse or annotateRef for commentary
@@ -912,9 +916,9 @@ bool handleToken(SWBuf &text, XMLTag token) {
}
if (inPreVerse) {
- char genBuf[200];
- sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" sID=\"pv%d\"/>", genID);
- text.append(genBuf);
+// char genBuf[200];
+// sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" sID=\"pv%d\"/>", genID);
+// text.append(genBuf);
}
}
@@ -1179,32 +1183,37 @@ XMLTag transformBSP(XMLTag t) {
}
}
else {
- XMLTag topToken = bspTagStack.top();
+ if (!bspTagStack.empty()) {
+ XMLTag topToken = bspTagStack.top();
- if (debug & DEBUG_XFORM) {
- cout << "DEBUG(XFORM): " << currentOsisID << ": xform pop(" << bspTagStack.size() << ") " << topToken << endl;
- }
+ if (debug & DEBUG_XFORM) {
+ cout << "DEBUG(XFORM): " << currentOsisID << ": xform pop(" << bspTagStack.size() << ") " << topToken << endl;
+ }
- bspTagStack.pop();
-
- // Look for the milestoneable container tags handled above.
- if (tagName == "chapter" ||
- tagName == "closer" ||
- tagName == "div" ||
- tagName == "l" ||
- tagName == "lg" ||
- tagName == "p" ||
- tagName == "q" ||
- tagName == "salute" ||
- tagName == "signed" ||
- tagName == "speech" ||
- tagName == "verse"
- ) {
- // make this a clone of the start tag with sID changed to eID
- // Note: in the case of </p> the topToken is a <div type="paragraph">
- t = topToken;
- t.setAttribute("eID", t.getAttribute("sID"));
- t.setAttribute("sID", 0);
+ bspTagStack.pop();
+
+ // Look for the milestoneable container tags handled above.
+ if (tagName == "chapter" ||
+ tagName == "closer" ||
+ tagName == "div" ||
+ tagName == "l" ||
+ tagName == "lg" ||
+ tagName == "p" ||
+ tagName == "q" ||
+ tagName == "salute" ||
+ tagName == "signed" ||
+ tagName == "speech" ||
+ tagName == "verse"
+ ) {
+ // make this a clone of the start tag with sID changed to eID
+ // Note: in the case of </p> the topToken is a <div type="paragraph">
+ t = topToken;
+ t.setAttribute("eID", t.getAttribute("sID"));
+ t.setAttribute("sID", 0);
+ }
+ }
+ else {
+ cout << "FATAL(TAGSTACK): " << currentOsisID << ": closing tag without opening tag" << endl;
}
}
@@ -1323,7 +1332,7 @@ void processOSIS(istream& infile) {
bool intoken = false;
bool inWhitespace = false;
bool seeingSpace = false;
- char curChar = '\0';
+ unsigned char curChar = '\0';
while (infile.good()) {
@@ -1342,7 +1351,7 @@ void processOSIS(istream& infile) {
// Outside of tokens merge adjacent whitespace
if (!intoken) {
- seeingSpace = isspace(curChar);
+ seeingSpace = isspace(curChar)!=0;
if (seeingSpace) {
if (inWhitespace) {
continue;
@@ -1394,7 +1403,7 @@ void processOSIS(istream& infile) {
int main(int argc, char **argv) {
- fprintf(stderr, "You are running osis2mod: $Rev: 2478 $\n");
+ fprintf(stderr, "You are running osis2mod: $Rev: 2562 $\n");
// Let's test our command line arguments
if (argc < 3) {
diff --git a/utilities/step2vpl.cpp b/utilities/step2vpl.cpp
index e1b00dc..30ffc7a 100644
--- a/utilities/step2vpl.cpp
+++ b/utilities/step2vpl.cpp
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <iostream>
#include <string>
#include <stdio.h>
diff --git a/utilities/stepdump.cpp b/utilities/stepdump.cpp
index 4838694..17fe88d 100644
--- a/utilities/stepdump.cpp
+++ b/utilities/stepdump.cpp
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/utilities/tei2mod.cpp b/utilities/tei2mod.cpp
index b42528d..531e01b 100644
--- a/utilities/tei2mod.cpp
+++ b/utilities/tei2mod.cpp
@@ -43,6 +43,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <string>
#include <vector>
#include <fstream>
diff --git a/utilities/treeidxutil.cpp b/utilities/treeidxutil.cpp
index e6b1b5c..81b3ac2 100644
--- a/utilities/treeidxutil.cpp
+++ b/utilities/treeidxutil.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <entriesblk.h>
#include <iostream>
#include <string>
diff --git a/utilities/vcppmake/addgb.vcproj b/utilities/vcppmake/addgb.vcproj
index e460afb..9eba2a8 100644
--- a/utilities/vcppmake/addgb.vcproj
+++ b/utilities/vcppmake/addgb.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/addld.vcproj b/utilities/vcppmake/addld.vcproj
index a1f9c04..1d611bb 100644
--- a/utilities/vcppmake/addld.vcproj
+++ b/utilities/vcppmake/addld.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/addvs.vcproj b/utilities/vcppmake/addvs.vcproj
index d2e9562..50a0814 100644
--- a/utilities/vcppmake/addvs.vcproj
+++ b/utilities/vcppmake/addvs.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/cipherraw.vcproj b/utilities/vcppmake/cipherraw.vcproj
index b2c989f..900ddd2 100644
--- a/utilities/vcppmake/cipherraw.vcproj
+++ b/utilities/vcppmake/cipherraw.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/emptyvss.vcproj b/utilities/vcppmake/emptyvss.vcproj
index 9fcc9e8..6aa02f3 100644
--- a/utilities/vcppmake/emptyvss.vcproj
+++ b/utilities/vcppmake/emptyvss.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/genbookutil.vcproj b/utilities/vcppmake/genbookutil.vcproj
index 8be2933..50068e1 100644
--- a/utilities/vcppmake/genbookutil.vcproj
+++ b/utilities/vcppmake/genbookutil.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/imp2gbs.vcproj b/utilities/vcppmake/imp2gbs.vcproj
index 5bacc44..43304b6 100644
--- a/utilities/vcppmake/imp2gbs.vcproj
+++ b/utilities/vcppmake/imp2gbs.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/imp2ld.vcproj b/utilities/vcppmake/imp2ld.vcproj
index 4552f02..a6e5b76 100644
--- a/utilities/vcppmake/imp2ld.vcproj
+++ b/utilities/vcppmake/imp2ld.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/imp2vs.vcproj b/utilities/vcppmake/imp2vs.vcproj
index 2288737..0129705 100644
--- a/utilities/vcppmake/imp2vs.vcproj
+++ b/utilities/vcppmake/imp2vs.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/installmgr.vcproj b/utilities/vcppmake/installmgr.vcproj
index a643ec1..0aac602 100644
--- a/utilities/vcppmake/installmgr.vcproj
+++ b/utilities/vcppmake/installmgr.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/mkfastmod.vcproj b/utilities/vcppmake/mkfastmod.vcproj
index d887006..66a42a7 100644
--- a/utilities/vcppmake/mkfastmod.vcproj
+++ b/utilities/vcppmake/mkfastmod.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/mod2imp.vcproj b/utilities/vcppmake/mod2imp.vcproj
index 18c489b..cff33a1 100644
--- a/utilities/vcppmake/mod2imp.vcproj
+++ b/utilities/vcppmake/mod2imp.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/mod2osis.vcproj b/utilities/vcppmake/mod2osis.vcproj
index 6107fc2..54582d9 100644
--- a/utilities/vcppmake/mod2osis.vcproj
+++ b/utilities/vcppmake/mod2osis.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/mod2vpl.vcproj b/utilities/vcppmake/mod2vpl.vcproj
index 61f32ab..7043386 100644
--- a/utilities/vcppmake/mod2vpl.vcproj
+++ b/utilities/vcppmake/mod2vpl.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/mod2zmod.vcproj b/utilities/vcppmake/mod2zmod.vcproj
index 3c9d834..c12ecd2 100644
--- a/utilities/vcppmake/mod2zmod.vcproj
+++ b/utilities/vcppmake/mod2zmod.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/modwrite.vcproj b/utilities/vcppmake/modwrite.vcproj
index 1e72106..f1cbc74 100644
--- a/utilities/vcppmake/modwrite.vcproj
+++ b/utilities/vcppmake/modwrite.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/osis2mod.vcproj b/utilities/vcppmake/osis2mod.vcproj
index 00b25c9..1b23c6f 100644
--- a/utilities/vcppmake/osis2mod.vcproj
+++ b/utilities/vcppmake/osis2mod.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -112,13 +112,17 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
+ Optimization="0"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="false"
+ FavorSizeOrSpeed="0"
+ WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ EnableFunctionLevelLinking="false"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
@@ -136,8 +140,9 @@
OutputFile="Release\$(ProjectName).exe"
AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICURelease"
GenerateDebugInformation="true"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ OptimizeReferences="0"
+ EnableCOMDATFolding="0"
+ LinkTimeCodeGeneration="0"
TargetMachine="1"
/>
<Tool
diff --git a/utilities/vcppmake/step2vpl.vcproj b/utilities/vcppmake/step2vpl.vcproj
index a0f08fd..f0b722b 100644
--- a/utilities/vcppmake/step2vpl.vcproj
+++ b/utilities/vcppmake/step2vpl.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/stepdump.vcproj b/utilities/vcppmake/stepdump.vcproj
index 312e667..605746d 100644
--- a/utilities/vcppmake/stepdump.vcproj
+++ b/utilities/vcppmake/stepdump.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/tei2mod.vcproj b/utilities/vcppmake/tei2mod.vcproj
index a9271c6..89a6c59 100644
--- a/utilities/vcppmake/tei2mod.vcproj
+++ b/utilities/vcppmake/tei2mod.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/treeidxutil.vcproj b/utilities/vcppmake/treeidxutil.vcproj
index 9a619de..a93fbc6 100644
--- a/utilities/vcppmake/treeidxutil.vcproj
+++ b/utilities/vcppmake/treeidxutil.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/vpl2mod.vcproj b/utilities/vcppmake/vpl2mod.vcproj
index 627d89d..6caea18 100644
--- a/utilities/vcppmake/vpl2mod.vcproj
+++ b/utilities/vcppmake/vpl2mod.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/vs2osisref.vcproj b/utilities/vcppmake/vs2osisref.vcproj
index 624c46a..cccaca2 100644
--- a/utilities/vcppmake/vs2osisref.vcproj
+++ b/utilities/vcppmake/vs2osisref.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/vs2osisreftxt.vcproj b/utilities/vcppmake/vs2osisreftxt.vcproj
index 9520b8f..d030ea9 100644
--- a/utilities/vcppmake/vs2osisreftxt.vcproj
+++ b/utilities/vcppmake/vs2osisreftxt.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vcppmake/xml2gbs.vcproj b/utilities/vcppmake/xml2gbs.vcproj
index c8ed4ed..f67d837 100644
--- a/utilities/vcppmake/xml2gbs.vcproj
+++ b/utilities/vcppmake/xml2gbs.vcproj
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
diff --git a/utilities/vpl2mod.cpp b/utilities/vpl2mod.cpp
index 65cf718..e2fca09 100644
--- a/utilities/vpl2mod.cpp
+++ b/utilities/vpl2mod.cpp
@@ -15,6 +15,11 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+ #pragma warning( disable: 4996 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/utilities/vs2osisref.cpp b/utilities/vs2osisref.cpp
index bdff592..275d724 100644
--- a/utilities/vs2osisref.cpp
+++ b/utilities/vs2osisref.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <iostream>
#include <versekey.h>
#include <localemgr.h>
@@ -22,6 +26,7 @@
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
+
using std::endl;
using std::cerr;
using std::cout;
diff --git a/utilities/vs2osisreftxt.cpp b/utilities/vs2osisreftxt.cpp
index a62daa0..bf99b88 100644
--- a/utilities/vs2osisreftxt.cpp
+++ b/utilities/vs2osisreftxt.cpp
@@ -15,11 +15,16 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <iostream>
#include <stdio.h>
#include <versekey.h>
#include <localemgr.h>
+
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
diff --git a/utilities/xml2gbs.cpp b/utilities/xml2gbs.cpp
index 62a22ab..72f9b41 100644
--- a/utilities/xml2gbs.cpp
+++ b/utilities/xml2gbs.cpp
@@ -15,6 +15,10 @@
*
*/
+#ifdef _MSC_VER
+ #pragma warning( disable: 4251 )
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>