diff --git a/.gitattributes b/.gitattributes index 14c75070..3a7c237f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,7 +15,6 @@ CorsixTH/Bitmap/flag_travel_east.bmp -text CorsixTH/Bitmap/flag_travel_north.bmp -text CorsixTH/Bitmap/flag_travel_south.bmp -text CorsixTH/Bitmap/flag_travel_west.bmp -text -CorsixTH/Bitmap/flags32.png -text CorsixTH/Bitmap/fullscreen_border_bottom.bmp -text CorsixTH/Bitmap/fullscreen_border_bottomleft.bmp -text CorsixTH/Bitmap/fullscreen_border_bottomright.bmp -text @@ -32,13 +31,6 @@ CorsixTH/Bitmap/map_cell_outline_east.bmp -text CorsixTH/Bitmap/map_cell_outline_north.bmp -text CorsixTH/Bitmap/map_cell_outline_south.bmp -text CorsixTH/Bitmap/map_cell_outline_west.bmp -text -CorsixTH/Bitmap/new32.png -text svneol=unset#image/png -CorsixTH/Bitmap/open32.png -text svneol=unset#image/png -CorsixTH/Bitmap/parcels32.png -text -CorsixTH/Bitmap/positions32.png -text -CorsixTH/Bitmap/redo32.png -text -CorsixTH/Bitmap/save32.png -text svneol=unset#image/png -CorsixTH/Bitmap/transparent_walls32.png -text CorsixTH/Bitmap/tree_collapsed.bmp -text CorsixTH/Bitmap/tree_ctrl.dat -text CorsixTH/Bitmap/tree_ctrl.pal -text @@ -46,7 +38,6 @@ CorsixTH/Bitmap/tree_ctrl.tab -text CorsixTH/Bitmap/tree_expanded.bmp -text CorsixTH/Bitmap/tree_leaf.bmp -text CorsixTH/Bitmap/tree_level.bmp -text -CorsixTH/Bitmap/undo32.png -text CorsixTH/CorsixTH.ico -text CorsixTH/Icon.icns -text CorsixTH/Levels/Example.map -text @@ -54,11 +45,6 @@ CorsixTH/Levels/avatar.map -text CorsixTH/Levels/confined_v5.map -text CorsixTH/Levels/finisham.map -text CorsixTH/Levels/original08.level -text -CorsixTH/Lua/command.lua -text -CorsixTH/Lua/command_stack.lua -text -CorsixTH/Lua/commands/compound.lua -text -CorsixTH/Lua/commands/set_map_cell.lua -text -CorsixTH/Lua/commands/set_map_cell_flags.lua -text CorsixTH/Lua/dialogs/resizables/customise.lua -text CorsixTH/Lua/dialogs/resizables/folder_settings.lua -text CorsixTH/Lua/dialogs/resizables/update.lua -text @@ -104,7 +90,4 @@ LevelEdit/src/icon256.png -text LevelEdit/src/icon32.png -text LevelEdit/src/icon48.png -text LevelEdit/src/icon64.png -text -MapEdit/Icon.icns -text -MapEdit/MapEdit.ico -text -MapEdit/RequiredResources.txt -text WindowsInstaller/welcome.bmp -text diff --git a/CMakeLists.txt b/CMakeLists.txt index 0efc3d0f..deaa252f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ # - WITH_FREETYPE2 # - WITH_MOVIES : Activate movies (requires Sound) # - BUILD_ANIMVIEWER -# - BUILD_MAPEDITOR # - WITH_LUAJIT : Whether to use LuaJIT 2 instead of Lua51 (default is LuaJIT 2) # - WITH_LIBAV : Whether to use LibAV (as opposed to FFMEPG) when building movies # - WITH_VLD : Build with Visual Leak Detector (requires Visual Studio) @@ -37,7 +36,6 @@ OPTION(WITH_FREETYPE2 "Enhanced Font Support" ON) OPTION(WITH_LUAJIT "Use LuaJIT instead of Lua" OFF) OPTION(WITH_LIBAV "Use LibAV instead of FFmpeg" OFF) OPTION(BUILD_ANIMVIEWER "Build the animation viewer as part of the build process" OFF) -OPTION(BUILD_MAPEDITOR "Build the map editor as part of the build process" OFF) IF(MSVC) OPTION(WITH_VLD "Build with Visual Leak Detector for Visual Studio" OFF) ENDIF(MSVC) @@ -107,15 +105,6 @@ IF(BUILD_ANIMVIEWER) add_subdirectory(AnimView) ENDIF(BUILD_ANIMVIEWER) -IF(BUILD_MAPEDITOR) - IF(WITH_OPENGL) - message("Building MapEdit") - add_subdirectory(MapEdit) - ELSE(WITH_OPENGL) - message(FATAL_ERROR "The map editor can only be built when using OpenGL as renderer") - ENDIF(WITH_OPENGL) -ENDIF(BUILD_MAPEDITOR) - # Documentation generation, construct 'doc' target (or a message it is disabled). # Try to find 'lua' @@ -172,14 +161,6 @@ IF (DOXYGEN_FOUND) add_dependencies(doc doc_leveledit) - add_custom_target(doc_mapedit - ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/DoxyGen/mapedit.doxygen - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc - COMMENT "Generating API documentation for MapEdit" VERBATIM - ) - add_dependencies(doc doc_mapedit) - - add_custom_target(doc_corsixth_engine ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/DoxyGen/corsixth_engine.doxygen WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc @@ -223,7 +204,6 @@ IF (DOXYGEN_FOUND) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/doc/index.html "