AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cmake' of https://github.com/jackoalan/PrimeWorldEditor into cmake

This commit is contained in:
Jack Andersen 2019-06-02 16:11:51 -10:00
parent a9cb0200cd 54940d33df
commit 0c68d8e3df
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -57,7 +57,7 @@ They should be set to `C:/Qt/<QT VERSION>/msvc2017_64/lib/cmake/Qt5`.
## Requirements ## Requirements
* [Xcode 10.2+](https://developer.apple.com/xcode/) * [Xcode 10.2+](https://developer.apple.com/xcode/)
* [Qt 5.10+](https://download.qt.io/official_releases/qt/) (Clang 64-bit specification) * [Qt 5.10+](https://download.qt.io/official_releases/qt/) (macOS specification)
* *cmake*, *ninja* and *python* installed using [Homebrew](https://brew.sh/) * *cmake*, *ninja* and *python* installed using [Homebrew](https://brew.sh/)
## Build using Xcode ## Build using Xcode
@ -83,7 +83,7 @@ They should be set to `C:/Qt/<QT VERSION>/msvc2017_64/lib/cmake/Qt5`.
## Requirements ## Requirements
* A working compiler toolchain (GCC or Clang) * A working compiler toolchain (GCC or Clang)
* *cmake*, *ninja*, *python3*, *clang* (library) packages * *cmake*, *ninja*, *python3*, *qt5* (dev), *clang* (dev) packages
## Build using Command Line ## Build using Command Line

4
dew.cmake
View File

@ -32,9 +32,9 @@ function(integrate_dew)
message(FATAL_ERROR "Failed to install dew with pip: result: ${install_dew_result}.") message(FATAL_ERROR "Failed to install dew with pip: result: ${install_dew_result}.")
endif() endif()
message(STATUS "Building dew dependencies") message(STATUS "Building dew dependencies")
execute_process(COMMAND "${Python3_EXECUTABLE}" -m dew update WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} execute_process(COMMAND "${Python3_EXECUTABLE}" -m dew update WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
RESULT_VARIABLE dew_res) RESULT_VARIABLE dew_res)
if(NOT ${dew_res} EQUAL 0) if(NOT dew_res EQUAL 0)
message(FATAL_ERROR "Unable to run dew: ${dew_res}") message(FATAL_ERROR "Unable to run dew: ${dew_res}")
endif() endif()
endif() endif()

2
src/Editor/CEditorApplication.cpp
View File

@ -364,7 +364,7 @@ void CEditorApplication::OnEditorClose()
if (pEditor != mpWorldEditor->TweakEditor()) if (pEditor != mpWorldEditor->TweakEditor())
{ {
delete pEditor; pEditor->deleteLater();
} }
if (mpActiveProject) if (mpActiveProject)