Merge pull request seandepagnier#232 from did-g/osx_packager

update OSX Packager to 1.2.4 version
rgleason · Oct 22, 2018 · 1cfa586 · 1cfa586
2 parents 7a239e8 + 20f8664
commit 1cfa586
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ install:
         echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile;
         wget http://s.sudre.free.fr/Software/files/Packages.dmg;
         hdiutil attach Packages.dmg;
-        sudo installer -pkg "/Volumes/Packages 1.2.3/Install Packages.pkg" -target "/";
+        sudo installer -pkg "/Volumes/Packages 1.2.4/Install Packages.pkg" -target "/";
       fi
 
 script:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,8 @@ ENDIF(NOT UNIX)
 #ENDIF(NOT UNIX)
 
 IF(MINGW)
-    TARGET_LINK_LIBRARIES(${PACKAGE_NAME} "-lwxzlib-2.8")
+#    TARGET_LINK_LIBRARIES(${PACKAGE_NAME} "-lwxzlib-2.8")
+    TARGET_LINK_LIBRARIES(${PACKAGE_NAME} "-lz")
 ENDIF(MINGW)
 
 INCLUDE("cmake/PluginJSON.cmake")

diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake
@@ -162,7 +162,7 @@ ENDIF(QT_ANDROID)
 
 IF(MSYS)
 # this is just a hack. I think the bug is in FindwxWidgets.cmake
-STRING( REGEX REPLACE "/usr/local" "\\\\;C:/MinGW/msys/1.0/usr/local" wxWidgets_INCLUDE_DIRS ${wxWidgets_INCLUDE_DIRS} )
+STRING( REGEX REPLACE "/usr/local" "\\\\;C:/MinGW/msys/1.0/usr/local" wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}" )
 ENDIF(MSYS)
 
 #  QT_ANDROID is a cross-build, so the native FIND_PACKAGE(OpenGL) is not useful.

diff --git a/src/WeatherRouting.cpp b/src/WeatherRouting.cpp
@@ -94,7 +94,7 @@ const wxString WeatherRouting::column_names[NUM_COLS] = {"Visible", "Boat", "Sta
 static int sortcol, sortorder = 1;
 // sort callback. Sort by body.
 #if wxCHECK_VERSION(2, 9, 0)
-int wxCALLBACK SortWeatherRoutes(long item1, long item2, wxIntPtr list)
+int wxCALLBACK SortWeatherRoutes(wxIntPtr item1, wxIntPtr item2, wxIntPtr list)
 #else
 int wxCALLBACK SortWeatherRoutes(long item1, long item2, long list)
 #endif            
@@ -1037,8 +1037,13 @@ void WeatherRouting::OnWeatherRouteSort( wxListEvent& event )
             UpdateItem(index);
         }
         RequestRefresh( GetParent() );
-    } else
+    } else {
+#if wxCHECK_VERSION(2, 9, 0)
+        m_panel->m_lWeatherRoutes->SortItems(SortWeatherRoutes, (wxIntPtr)m_panel->m_lWeatherRoutes);
+#else
         m_panel->m_lWeatherRoutes->SortItems(SortWeatherRoutes, (long)m_panel->m_lWeatherRoutes);
+#endif
+    }
 }
 
 void WeatherRouting::OnWeatherRouteSelected( )