Progress commit

CMakeLists.txt

@@ -8,8 +8,9 @@ set(CMAKE_CXX_STANDARD 11)
 # Hunter for dependency management
 include("cmake/HunterGate.cmake")
 HunterGate(
-	URL "https://github.com/ruslo/hunter/archive/v0.12.24.tar.gz"
-	SHA1 "a25a7fa55c204a8126efd1f48593a662925b26da"
+	URL "https://github.com/timw4mail/hunter/archive/1.0.1-timw4mail.tar.gz"
+	SHA1 "9aa41108d073e514cd87cb87c919f1471a8c74b7"
+	LOCAL
 )
 
 project(Tyro)
@@ -37,8 +38,9 @@ endif()
 
 # wxwidgets stuff
 set(wxWidgets_CONFIG_OPTIONS --static)
-unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT)
-hunter_add_package(wxWidgets)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	hunter_add_package(wxWidgets)
+endif()
 find_package(wxWidgets COMPONENTS core base aui stc adv REQUIRED)
 include("${wxWidgets_USE_FILE}")
 

README.md

@@ -17,22 +17,16 @@ A Cross-platform Code Editor
 Required packages:
 
 * build-essential
-* libwxgtk3.0-dev
 * libssh2-1-dev
-
-Optional:
-
-* libwxgtk3.0-0-dbg
-* libssh2-1-dbg
-
+* libwxgtk3.0-dev
 
 After these packages are installed, the project should build with a simple `make` command.
 
 ### OS X
 Building wxWidgets:
 
-If you want maximum compatibility with older versions of OS X, 
-view [the guide](./Mac-compatibility-build.md). Otherwise, these simpler 
+If you want maximum compatibility with older versions of OS X,
+view [the guide](./Mac-compatibility-build.md). Otherwise, these simpler
 steps should work fine for a local build.
 
 1. Download the latest wxWidgets source (>= 3.0.2)
@@ -64,4 +58,4 @@ Please note that make commands are chainable. For a typical programming loop, `m
 
 
 
- 
+

cmake.sh

@@ -9,7 +9,7 @@ export CMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/M
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
 	cd build
-	cmake -DHUNTER_SKIP_LOCK=ON ..
+	cmake -DHUNTER_ENABLED=OFF  ..
 	make "$@"
 	cd ..
 elif [[ "$OSTYPE" == "darwin"* ]]; then

cmake/hunter/config.cmake

@@ -0,0 +1,9 @@
+hunter_config(
+	wxWidgets
+	VERSION 3.0.2
+	CMAKE_ARGS
+		WXBUILD_SYSTEM_PNG=OFF
+		WXBUILD_SHARED_LIBS=OFF
+		wxUSE_WEBVIEW_WEBKIT=OFF
+		wxUSE_GLCANVAS=OFF
+)