summary refs log tree commit diff stats
path: root/tools/mapedit
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2018-02-12 16:53:30 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2018-02-12 16:53:30 -0500
commit3df19e45e737a1b9395a9a258e3263e444ebedd7 (patch)
tree896adccf14054cf54291c1d5bc7825a8888a351b /tools/mapedit
parent5cc80ec58ea5bd66456f6f5286fa5f26d3fe702b (diff)
parentbc63fa57ced1c7329f7fdcfd168eaf7e290158bc (diff)
downloadtherapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.tar.gz
therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.tar.bz2
therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.zip
Merge branch 'master' into es-rewrite
Diffstat (limited to 'tools/mapedit')
-rw-r--r--tools/mapedit/CMakeLists.txt27
-rw-r--r--tools/mapedit/src/frame.cpp1
2 files changed, 7 insertions, 21 deletions
diff --git a/tools/mapedit/CMakeLists.txt b/tools/mapedit/CMakeLists.txt index b225834..4ce9133 100644 --- a/tools/mapedit/CMakeLists.txt +++ b/tools/mapedit/CMakeLists.txt
@@ -1,26 +1,9 @@
1cmake_minimum_required(VERSION 2.6) 1cmake_minimum_required (VERSION 3.1)
2project(AromatherapyMapEditor) 2project (AromatherapyMapEditor)
3 3
4# Set directory to look for package helpers.
4set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${AromatherapyMapEditor_SOURCE_DIR}/cmake") 5set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${AromatherapyMapEditor_SOURCE_DIR}/cmake")
5# Set an output directory for our binaries
6set(BIN_DIR ${AromatherapyMapEditor_SOURCE_DIR}/bin)
7 6
8# Bump up warning levels appropriately for clang, gcc & msvc
9# Also set debug/optimization flags depending on the build type. IDE users choose this when
10# selecting the build mode in their IDE
11if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
12 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11")
13 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g -O0")
14 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2")
15elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
16 if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
17 string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
18 else()
19 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
20 endif()
21endif()
22
23# Look up SDL2 and add the include directory to our include path
24find_package(wxWidgets REQUIRED core base) 7find_package(wxWidgets REQUIRED core base)
25include(${wxWidgets_USE_FILE}) 8include(${wxWidgets_USE_FILE})
26 9
@@ -48,5 +31,7 @@ add_executable(AromatherapyMapEditor
48 src/undo.cpp 31 src/undo.cpp
49 src/mapselect_combo.cpp 32 src/mapselect_combo.cpp
50) 33)
34
35set_property(TARGET AromatherapyMapEditor PROPERTY CXX_STANDARD 11)
36set_property(TARGET AromatherapyMapEditor PROPERTY CXX_STANDARD_REQUIRED ON)
51target_link_libraries(AromatherapyMapEditor ${ALL_LIBS}) 37target_link_libraries(AromatherapyMapEditor ${ALL_LIBS})
52install(TARGETS AromatherapyMapEditor RUNTIME DESTINATION ${BIN_DIR})
diff --git a/tools/mapedit/src/frame.cpp b/tools/mapedit/src/frame.cpp index aad3294..7112102 100644 --- a/tools/mapedit/src/frame.cpp +++ b/tools/mapedit/src/frame.cpp
@@ -15,6 +15,7 @@
15static std::list<wxWindow*> openWindows; 15static std::list<wxWindow*> openWindows;
16 16
17enum { 17enum {
18 IGNORE,
18 MENU_VIEW_ZOOM_IN, 19 MENU_VIEW_ZOOM_IN,
19 MENU_VIEW_ZOOM_OUT, 20 MENU_VIEW_ZOOM_OUT,
20 MENU_FILE_NEW, 21 MENU_FILE_NEW,