Merge pull request seandepagnier#234 from did-g/json_mingw

Json and mingw
rgleason · Jan 8, 2019 · a5e2395 · a5e2395
2 parents 1cfa586 + 8a1fbf1
commit a5e2395
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 1,054 deletions.
diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake
@@ -85,6 +85,7 @@ ENDIF(DEFINED _wx_selected_config)
 MESSAGE (STATUS "*** Staging to build ${PACKAGE_NAME} ***")
 
 include  ("VERSION.cmake")
+configure_file(${PROJECT_SOURCE_DIR}/cmake/wxWTranslateCatalog.h.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/wxWTranslateCatalog.h)
 
 #  Do the version.h configuration into the build output directory,
 #  thereby allowing building from a read-only source tree.
@@ -95,7 +96,7 @@ ENDIF(NOT SKIP_VERSION_CONFIG)
 
 SET(PLUGIN_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}" )
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src)
 
 # SET(PROFILING 1)
 
@@ -276,13 +277,6 @@ IF(NOT WIN32)
 
 ENDIF(NOT WIN32)
 
-
-# Add some definitions to satisfy MS
-IF(WIN32)
-    ADD_DEFINITIONS(-D__MSVC__)
-    ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE)
-ENDIF(WIN32)
-
 # Let cmake find additional modules private
 LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 

diff --git a/cmake/PluginGL.cmake b/cmake/PluginGL.cmake
@@ -11,5 +11,5 @@ SET(SRC_PLUGINGL
           src/plugingl/qtstylesheet.cpp
           )
 
-ADD_LIBRARY(LIB_PLUGINGL STATIC ${SRC_PLUGINGL})
-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} LIB_PLUGINGL )
+ADD_LIBRARY(${PACKAGE_NAME}_LIB_PLUGINGL STATIC ${SRC_PLUGINGL})
+TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} ${PACKAGE_NAME}_LIB_PLUGINGL )
diff --git a/cmake/PluginJSON.cmake b/cmake/PluginJSON.cmake
@@ -17,5 +17,5 @@ ENDIF(QT_ANDROID)
 
 INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/jsoncpp)
 
-ADD_LIBRARY(LIB_PLUGINJSON STATIC ${SRC_JSON})
-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} LIB_PLUGINJSON )
+ADD_LIBRARY(${PACKAGE_NAME}_LIB_PLUGINJSON STATIC ${SRC_JSON})
+TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} ${PACKAGE_NAME}_LIB_PLUGINJSON )
diff --git a/cmake/PluginNMEA.cmake b/cmake/PluginNMEA.cmake
@@ -42,5 +42,5 @@ SET(SRC_NMEA0183
 
 INCLUDE_DIRECTORIES(src/nmea0183)
 
-ADD_LIBRARY(LIB_PLUGINNMEA0183 STATIC ${SRC_NMEA0183})
-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} LIB_PLUGINNMEA0183 )
+ADD_LIBRARY(${PACKAGE_NAME}_LIB_PLUGINNMEA0183 STATIC ${SRC_NMEA0183})
+TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} ${PACKAGE_NAME}_LIB_PLUGINNMEA0183 )
diff --git a/cmake/PluginXML.cmake b/cmake/PluginXML.cmake
@@ -11,8 +11,8 @@ SET(SRC_TINYXML
             src/tinyxml/tinyxmlparser.cpp
             src/tinyxml/tinyxmlerror.cpp
 )
-ADD_LIBRARY(LIB_PLUGINXML STATIC ${SRC_TINYXML})
-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} LIB_PLUGINXML )
+ADD_LIBRARY(${PACKAGE_NAME}_LIB_PLUGINXML STATIC ${SRC_TINYXML})
+TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} ${PACKAGE_NAME}_LIB_PLUGINXML )
 ENDIF(WIN32)
 
 ADD_DEFINITIONS(-DTIXML_USE_STL)
diff --git a/include/GL/gl.h b/include/GL/gl.h
@@ -86,7 +86,7 @@
 
 #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
      && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
-#include <GL/mesa_wgl.h>
+// #include <GL/mesa_wgl.h>
 #endif
 
 #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED

diff --git a/src/RouteMap.cpp b/src/RouteMap.cpp
@@ -80,8 +80,6 @@
 #include "weather_routing_pi.h"
 
 #include "georef.h"
-#include "wx/jsonreader.h"
-#include "wx/jsonwriter.h"
 
 #define distance(X, Y) sqrt((X)*(X) + (Y)*(Y)) // much faster than hypot
 
@@ -1376,10 +1374,10 @@ void IsoRoute::FindIsoRouteBounds(double bounds[4])
     SkipPosition *s = skippoints->next;
     while(s != skippoints) {
         p = s->point;
-        bounds[MINLAT] = MIN(p->lat, bounds[MINLAT]);
-        bounds[MAXLAT] = MAX(p->lat, bounds[MAXLAT]);
-        bounds[MINLON] = MIN(p->lon, bounds[MINLON]);
-        bounds[MAXLON] = MAX(p->lon, bounds[MAXLON]);
+        bounds[MINLAT] = wxMin(p->lat, bounds[MINLAT]);
+        bounds[MAXLAT] = wxMax(p->lat, bounds[MAXLAT]);
+        bounds[MINLON] = wxMin(p->lon, bounds[MINLON]);
+        bounds[MAXLON] = wxMax(p->lon, bounds[MAXLON]);
 
         if(p->lat == bounds[MAXLAT])
             maxlat = s;

diff --git a/src/RouteMapOverlay.cpp b/src/RouteMapOverlay.cpp
@@ -28,9 +28,7 @@
 
 #include "ocpn_plugin.h"
 #include "plugingl/pidc.h"
-#include "wx/jsonreader.h"
-#include "wx/jsonwriter.h"
-
+#include "json/json.h"
 #include "Utilities.h"
 #include "Boat.h"
 #include "RouteMapOverlay.h"
@@ -1251,20 +1249,18 @@ void RouteMapOverlay::GetLLBounds(double &latmin, double &latmax, double &lonmin
 
 void RouteMapOverlay::RequestGrib(wxDateTime time)
 {
-    wxJSONValue v;
+    Json::Value v;
     time = time.FromUTC();
-    v[_T("Day")] = time.GetDay();
-    v[_T("Month")] = time.GetMonth();
-    v[_T("Year")] = time.GetYear();
-    v[_T("Hour")] = time.GetHour();
-    v[_T("Minute")] = time.GetMinute();
-    v[_T("Second")] = time.GetSecond();
+    v["Day"] = time.GetDay();
+    v["Month"] = time.GetMonth();
+    v["Year"] = time.GetYear();
+    v["Hour"] = time.GetHour();
+    v["Minute"] = time.GetMinute();
+    v["Second"] = time.GetSecond();
 
-    wxJSONWriter w;
-    wxString out;
-    w.Write(v, out);
+    Json::FastWriter w;
 
-    SendPluginMessage(wxString(_T("GRIB_TIMELINE_RECORD_REQUEST")), out);
+    SendPluginMessage("GRIB_TIMELINE_RECORD_REQUEST", w.write(v));
 
     Lock();
     m_bNeedsGrib = false;

diff --git a/src/plugingl/pidc.h b/src/plugingl/pidc.h
@@ -45,6 +45,18 @@
 //class ViewPort;
 class GLUtesselator;
 
+#ifndef DECL_EXP
+#ifdef __WXMSW__
+#  define DECL_EXP     __declspec(dllexport)
+#else
+# ifdef __GNUC__
+# define DECL_EXP       __attribute__((visibility("default")))
+#else
+#  define DECL_EXP
+# endif
+#endif
+#endif
+
 void DrawGLThickLine( float x1, float y1, float x2, float y2, wxPen pen, bool b_hiqual );
 
 //----------------------------------------------------------------------------