amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc: get this crap building locally

Browse Source 
Looks like my install via vcpkg sets up a different directory structure for hunspell
This commit is contained in:
Brendan Hagan
2022-06-07 00:24:17 -04:00
parent 28fbde97a6
commit 087da12893
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+3 -3
View File
@@ -1,7 +1,7 @@
name: windows-build name: windows-build
on: on:
push: # push:
branches: [master] # branches: [master]
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@@ -36,4 +36,4 @@ jobs:
name: build name: build
path: | path: |
./build/magicseteditor* ./build/magicseteditor*
/mingw64/bin/libhunspell-1.7-0.dll /mingw64/bin/libhunspell-1.7-0.dll
CMakeLists.txt
+3 -1
View File
@@ -14,8 +14,10 @@ find_package(PkgConfig)
pkg_check_modules(HUNSPELL hunspell) pkg_check_modules(HUNSPELL hunspell)
if( NOT HUNSPELL_FOUND ) if( NOT HUNSPELL_FOUND )
message("-- Cannot find Hunspell via pkg-config, checking directly...") message("-- Cannot find Hunspell via pkg-config, checking directly...")
find_path(HUNSPELL_INCLUDE_DIRS hunspell/hunspell.hxx) find_path(HUNSPELL_INCLUDE_DIRS hunspell.hxx)
message("-- HUNSPELL_INCLUDE_DIRS = ${HUNSPELL_INCLUDE_DIRS}")
find_library(HUNSPELL_LIBRARIES NAMES hunspell libhunspell) find_library(HUNSPELL_LIBRARIES NAMES hunspell libhunspell)
message("-- HUNSPELL_LIBRARIES = ${HUNSPELL_LIBRARIES}")
if ( ${HUNSPELL_INCLUDE_DIRS} STREQUAL "HUNSPELL_INCLUDE_DIRS-NOTFOUND" ) if ( ${HUNSPELL_INCLUDE_DIRS} STREQUAL "HUNSPELL_INCLUDE_DIRS-NOTFOUND" )
message(FATAL_ERROR "Hunspell cannot be found") message(FATAL_ERROR "Hunspell cannot be found")
else() else()
CMakeSettings.json
+6 -10
View File
@@ -9,8 +9,7 @@
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x86" ], "inheritEnvironments": [ "msvc_x86" ]
"variables": []
}, },
{ {
"name": "x86-Release", "name": "x86-Release",
@@ -22,7 +21,7 @@
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x86" ], "inheritEnvironments": [ "msvc_x86" ],
"variables": [] "cmakeToolchain": "C:/git/vcpkg/scripts/buildsystems/vcpkg.cmake"
}, },
{ {
"name": "x64-Debug", "name": "x64-Debug",
@@ -33,8 +32,7 @@
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ], "inheritEnvironments": [ "msvc_x64_x64" ]
"variables": []
}, },
{ {
"name": "x64-Release", "name": "x64-Release",
@@ -45,8 +43,7 @@
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ], "inheritEnvironments": [ "msvc_x64_x64" ]
"variables": []
}, },
{ {
"name": "x86-Release-static", "name": "x86-Release-static",
@@ -58,7 +55,7 @@
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x86" ], "inheritEnvironments": [ "msvc_x86" ],
"variables": [] "cmakeToolchain": "C:/git/vcpkg/scripts/buildsystems/vcpkg.cmake"
}, },
{ {
"name": "x64-Release-static", "name": "x64-Release-static",
@@ -69,8 +66,7 @@
"cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static", "cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static",
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ], "inheritEnvironments": [ "msvc_x64_x64" ]
"variables": []
} }
] ]
} }
README.md
+7 -6
View File
@@ -19,12 +19,13 @@ On windows, the program can be compiled with Visual Studio (recommended) or with
* Download and install [vcpkg](https://github.com/microsoft/vcpkg) * Download and install [vcpkg](https://github.com/microsoft/vcpkg)
* Use vcpkg to install wxwidgets, boost, hunspell * Use vcpkg to install wxwidgets, boost, hunspell
```` ````
vcpkg install wxwidgets vcpkg install wxwidgets:x86-windows-static
vcpkg install boost-smart-ptr vcpkg install boost-smart-ptr:x86-windows-static
vcpkg install boost-regex vcpkg install boost-regex:x86-windows-static
vcpkg install boost-logic vcpkg install boost-logic:x86-windows-static
vcpkg install boost-pool vcpkg install boost-pool:x86-windows-static
vcpkg install hunspell vcpkg install boost-iterator:x86-windows-static
vcpkg install hunspell:x86-windows-static
vcpkg integrate install vcpkg integrate install
```` ````
* Then just use "Open Folder" from inside visual studio to open the Magic Set Editor source code root folder. * Then just use "Open Folder" from inside visual studio to open the Magic Set Editor source code root folder.
src/gui/util.cpp
+1
View File
@@ -12,6 +12,7 @@
#include <util/rotation.hpp> #include <util/rotation.hpp>
#include <wx/renderer.h> #include <wx/renderer.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#include <wx/mstream.h>
#include <gfx/gfx.hpp> #include <gfx/gfx.hpp>
// ----------------------------------------------------------------------------- : Window related // ----------------------------------------------------------------------------- : Window related
src/util/spell_checker.hpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include <util/prec.hpp> #include <util/prec.hpp>
#undef near #undef near
#include "hunspell/hunspell.hxx" #include "hunspell.hxx"
DECLARE_POINTER_TYPE(SpellChecker); DECLARE_POINTER_TYPE(SpellChecker);