[mapguide-commits] r9395 - in branches/3.1/MgDev/Web/src: JavaApi JavaApiEx PhpApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-06-02 23:34:32 -0700 (Sat, 02 Jun 2018)
New Revision: 9395

Modified:
   branches/3.1/MgDev/Web/src/JavaApi/Makefile.am
   branches/3.1/MgDev/Web/src/JavaApiEx/Makefile.am
   branches/3.1/MgDev/Web/src/PhpApi/Makefile.am
Log:
#2781: Limit the scope of these changes to Windows. Linux never had these conflicts, so no need to apply any of these changes there.

Modified: branches/3.1/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- branches/3.1/MgDev/Web/src/JavaApi/Makefile.am	2018-06-02 16:50:40 UTC (rev 9394)
+++ branches/3.1/MgDev/Web/src/JavaApi/Makefile.am	2018-06-03 06:34:32 UTC (rev 9395)
@@ -21,7 +21,8 @@
            -I../../../Oem/ACE/ACE_wrappers \
            -I../HttpHandler \
            -I../WebSupport \
-           -I../WebApp
+           -I../WebApp \
+           -I../../../Oem/dbxml/xerces-c-src/src
 
 BUILT_SOURCES = MgApi_wrap.cpp
 
@@ -29,7 +30,7 @@
 
 nodist_libMapGuideJavaApi_la_SOURCES = MgApi_wrap.cpp
 
-AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -fno-var-tracking-assignments -DJAVA -DSWIG_PUBLIC_API
+AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -fno-var-tracking-assignments -DJAVA
 
 libMapGuideJavaApi_la_LIBADD = \
     -lACE \
@@ -40,6 +41,7 @@
     -lMgHttpHandler \
     -lMgMdfModel \
     -lMgMdfParser \
+    -lxerces-c \
     -lMgWebApp
 
 libMapGuideJavaApi_la_LDFLAGS = -release $(PACKAGE_VERSION) \

Modified: branches/3.1/MgDev/Web/src/JavaApiEx/Makefile.am
===================================================================
--- branches/3.1/MgDev/Web/src/JavaApiEx/Makefile.am	2018-06-02 16:50:40 UTC (rev 9394)
+++ branches/3.1/MgDev/Web/src/JavaApiEx/Makefile.am	2018-06-03 06:34:32 UTC (rev 9395)
@@ -21,7 +21,8 @@
            -I../../../Oem/ACE/ACE_wrappers \
            -I../HttpHandler \
            -I../WebSupport \
-           -I../WebApp
+           -I../WebApp \
+           -I../../../Oem/dbxml/xerces-c-src/src
 
 BUILT_SOURCES = MgApi_wrap.cpp
 
@@ -29,7 +30,7 @@
 
 nodist_libMapGuideJavaApiEx_la_SOURCES = MgApi_wrap.cpp
 
-AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -fno-var-tracking-assignments -DJAVA -DSWIG_PUBLIC_API
+AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -fno-var-tracking-assignments -DJAVA
 
 libMapGuideJavaApiEx_la_LIBADD = \
     -lACE \
@@ -40,6 +41,7 @@
     -lMgHttpHandler \
     -lMgMdfModel \
     -lMgMdfParser \
+    -lxerces-c \
     -lMgWebApp
 
 libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \

Modified: branches/3.1/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- branches/3.1/MgDev/Web/src/PhpApi/Makefile.am	2018-06-02 16:50:40 UTC (rev 9394)
+++ branches/3.1/MgDev/Web/src/PhpApi/Makefile.am	2018-06-03 06:34:32 UTC (rev 9395)
@@ -21,13 +21,14 @@
            -I../../../Oem/ACE/ACE_wrappers \
            -I../HttpHandler \
            -I../WebSupport \
-           -I../WebApp
+           -I../WebApp \
+           -I../../../Oem/dbxml/xerces-c-src/src
 
 lib_LTLIBRARIES = libphp_MapGuideApi.la
 
 nodist_libphp_MapGuideApi_la_SOURCES = MgApi_wrap.cpp
 
-AM_CXXFLAGS = @CXXFLAGS@ -fno-var-tracking-assignments -DPHP -DPHPPROXYAPI_EXPORTS -DSWIG_PUBLIC_API
+AM_CXXFLAGS = @CXXFLAGS@ -fno-var-tracking-assignments -DPHP -DPHPPROXYAPI_EXPORTS
 
 libphp_MapGuideApi_la_LIBADD = \
     -lACE \
@@ -38,6 +39,7 @@
     -lMgHttpHandler \
     -lMgMdfModel \
     -lMgMdfParser \
+    -lxerces-c \
     -lMgWebApp
 
 libphp_MapGuideApi_la_LDFLAGS = -release $(PACKAGE_VERSION) \