gnucash master: Fix up Win32 Build.
John Ralls
jralls at code.gnucash.org
Sun Jul 12 01:06:08 EDT 2015
Updated via https://github.com/Gnucash/gnucash/commit/613bf2ec (commit)
from https://github.com/Gnucash/gnucash/commit/b9d6b842 (commit)
commit 613bf2ec0ed7b8abcf2957aa4c735f7f760c404d
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 11 22:05:28 2015 -0700
Fix up Win32 Build.
diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
index 5dbe1bb..a8e7590 100644
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@@ -65,7 +65,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/libqof/qof \
${GUILE_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${BOOST_CPPFLAGS}
test_app_utils_SOURCES = \
test-app-utils.c \
diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am
index a2b5b80..3e2c2ee 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@ -15,7 +15,8 @@ AM_CPPFLAGS = \
-DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \
-DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \
${GLIB_CFLAGS} \
- ${GUILE_CFLAGS}
+ ${GUILE_CFLAGS} \
+ ${BOOST_CPPFLAGS}
LDADD = ${top_builddir}/src/test-core/libtest-core.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
diff --git a/src/backend/sql/Makefile.am b/src/backend/sql/Makefile.am
index 11a7bd5..845fffa 100644
--- a/src/backend/sql/Makefile.am
+++ b/src/backend/sql/Makefile.am
@@ -17,7 +17,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/libqof/qof \
${GLIB_CFLAGS} \
${GUILE_CFLAGS} \
- ${WARN_CFLAGS}
+ ${WARN_CFLAGS} \
+ ${BOOST_CPPFLAGS}
libgnc_backend_sql_la_SOURCES = \
gnc-backend-sql.c \
diff --git a/src/backend/sql/gnc-slots-sql.cpp b/src/backend/sql/gnc-slots-sql.cpp
index bbe2993..cefb48b 100644
--- a/src/backend/sql/gnc-slots-sql.cpp
+++ b/src/backend/sql/gnc-slots-sql.cpp
@@ -187,9 +187,9 @@ get_key_from_path( GString *path )
{
gchar *str = NULL, *key = NULL, *ret = NULL;
- g_return_val_if_fail( path != NULL, strdup("") );
+ g_return_val_if_fail( path != NULL, g_strdup("") );
- if ( path->str == NULL ) return strdup("");
+ if ( path->str == NULL ) return g_strdup("");
str = g_strdup( path->str );
key = strrchr( str, '/');
@@ -204,7 +204,7 @@ get_key_from_path( GString *path )
/* Now advance key past the last intermediate / to get the post-delimiter string */
while ( *key == '/') ++key;
- ret = strdup( key );
+ ret = g_strdup (key);
g_free( str );
return ret;
}
diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am
index 34aeb2a..184b0ea 100644
--- a/src/backend/xml/Makefile.am
+++ b/src/backend/xml/Makefile.am
@@ -15,7 +15,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/libqof/qof \
-I$(top_srcdir)/src \
${LIBXML2_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${BOOST_CPPFLAGS}
libgnc_backend_xml_utils_la_SOURCES = \
gnc-account-xml-v2.c \
diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
index b1d24c6..4ebda5e 100644
--- a/src/backend/xml/test/Makefile.am
+++ b/src/backend/xml/test/Makefile.am
@@ -266,7 +266,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/libqof/qof \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS} \
- ${GUILE_CFLAGS}
+ ${GUILE_CFLAGS} \
+ ${BOOST_CPPFLAGS}
EXTRA_DIST = \
grab-types.pl \
diff --git a/src/engine/Account.c b/src/engine/Account.c
index 706463f..3373fc9 100644
--- a/src/engine/Account.c
+++ b/src/engine/Account.c
@@ -28,6 +28,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include "AccountP.h"
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index f268547..eb69295 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -10,7 +10,9 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/libqof/qof \
${GLIB_CFLAGS} \
- ${GUILE_CFLAGS}
+ ${GUILE_CFLAGS} \
+ $(BOOST_CPPFLAGS)
+
libgncmod_engine_la_SOURCES = \
Account.c \
@@ -129,6 +131,9 @@ noinst_HEADERS = \
policy-p.h
libgncmod_engine_la_LDFLAGS = -avoid-version
+if PLATFORM_WIN32
+libgncmod_engine_la_LDFLAGS += -Wl,-export-all-symbols
+endif
if CLANG
libgncmod_engine_la_CFLAGS = ${AM_CFLAGS} -Wno-invalid-source-encoding
else
diff --git a/src/engine/kvp-scm.cpp b/src/engine/kvp-scm.cpp
index ca92cdc..8755f1e 100644
--- a/src/engine/kvp-scm.cpp
+++ b/src/engine/kvp-scm.cpp
@@ -1,3 +1,4 @@
+#include <kvp_frame.hpp>
#include <libguile.h>
extern "C"
@@ -13,8 +14,6 @@ extern "C"
#include "kvp-scm.h"
}
-#include <kvp_frame.hpp>
-
/* NOTE: There are some problems with this approach. Currently,
* guids are stored simply as strings in scheme, so some
* strings could be mistaken for guids, although that is
diff --git a/src/engine/test-core/Makefile.am b/src/engine/test-core/Makefile.am
index 928f79a..7033bb6 100644
--- a/src/engine/test-core/Makefile.am
+++ b/src/engine/test-core/Makefile.am
@@ -23,4 +23,5 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/libqof/qof \
${GLIB_CFLAGS} \
- ${GUILE_CFLAGS}
+ ${GUILE_CFLAGS} \
+ ${BOOST_CPPFLAGS}
diff --git a/src/engine/test-core/test-engine-stuff.cpp b/src/engine/test-core/test-engine-stuff.cpp
index 3cae5df..15150db 100644
--- a/src/engine/test-core/test-engine-stuff.cpp
+++ b/src/engine/test-core/test-engine-stuff.cpp
@@ -19,8 +19,10 @@
extern "C"
{
-#include "config.h"
-
+#include <platform.h>
+#if PLATFORM(WINDOWS)
+#define __STDC_FORMAT_MACROS
+#endif
#include <sys/types.h>
#include <dirent.h>
#include <fcntl.h>
@@ -31,7 +33,6 @@ extern "C"
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <unistd.h>
#include <qof.h>
#include <qofinstance-p.h>
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index b461238..35e3c43 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -12,7 +12,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/libqof/qof \
-I${top_srcdir}/src/core-utils \
${GUILE_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${BOOST_CPPFLAGS}
LDADD = \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
diff --git a/src/libqof/qof/kvp-value.cpp b/src/libqof/qof/kvp-value.cpp
index bd07419..a671284 100644
--- a/src/libqof/qof/kvp-value.cpp
+++ b/src/libqof/qof/kvp-value.cpp
@@ -24,6 +24,7 @@
#include "kvp-value.hpp"
#include "kvp_frame.hpp"
#include <cmath>
+
#include <sstream>
#include <iomanip>
#include <stdexcept>
Summary of changes:
src/app-utils/test/Makefile.am | 3 ++-
src/backend/dbi/test/Makefile.am | 3 ++-
src/backend/sql/Makefile.am | 3 ++-
src/backend/sql/gnc-slots-sql.cpp | 6 +++---
src/backend/xml/Makefile.am | 3 ++-
src/backend/xml/test/Makefile.am | 3 ++-
src/engine/Account.c | 1 +
src/engine/Makefile.am | 7 ++++++-
src/engine/kvp-scm.cpp | 3 +--
src/engine/test-core/Makefile.am | 3 ++-
src/engine/test-core/test-engine-stuff.cpp | 7 ++++---
src/engine/test/Makefile.am | 3 ++-
src/libqof/qof/kvp-value.cpp | 1 +
13 files changed, 30 insertions(+), 16 deletions(-)
More information about the gnucash-changes
mailing list