Skip to content

Commit

Permalink
Removed Boost dependency and updated README
Browse files Browse the repository at this point in the history
  • Loading branch information
Marukyu committed Jun 6, 2016
1 parent c3d5378 commit 1c05577
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 418 deletions.
10 changes: 1 addition & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,11 @@ add_executable(${EXECUTABLE_NAME} ${SOURCES})
# Add CMake modules
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

# Detect and add Boost
# TODO: Determine actual required Boost version.
find_package(Boost 1.47.0 REQUIRED COMPONENTS filesystem system)
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
target_link_libraries(${EXECUTABLE_NAME} ${Boost_LIBRARIES})
endif()

# Detect and add SFML
find_package(SFML 2 REQUIRED graphics window system)
if(SFML_FOUND)
include_directories(${SFML_INCLUDE_DIR})
target_link_libraries(${EXECUTABLE_NAME} ${SFML_LIBRARIES})
target_link_libraries(${EXECUTABLE_NAME} ${SFML_LIBRARIES} ${SFML_DEPENDENCIES})
endif()

# Detect and add OpenGL
Expand Down
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,17 @@ Choose a tool from the toolbar at the top of the editor window to get started.

Extract the Windows release archive to your desired installation folder and open `NecroEdit.exe`.

If `vcruntime140.dll` or any other DLL file is missing, install
[Visual C++ 2015 Redistributable](https://www.microsoft.com/en-us/download/details.aspx?id=48145) restart your computer
and try running NecroEdit again.

If the DLL problem persists, please report the bug by opening an issue on this GitHub repository.
If any errors messages show up when you start NecroEdit, please report the bug by opening an issue on NecroEdit's issue
tracker on GitHub.

### Linux

**[Download the latest release here!](https://github.com/Marukyu/NecroEdit/releases)**

[SFML 2.3](http://sfml-dev.org), [Boost](http://boost.org) System and Boost Filesystem are required. You can install
them using your distribution's package manager or from the repsective project websites.
[SFML 2.3](http://sfml-dev.org) is required. You can install it using your distribution's package manager or from the
library's website.

Additionally, a recent version (GLIBCXX >= 3.4.18) of the GNU C++ runtime library (libstdc++6) is required.

Extract the Linux release archive to your desired installation path and run `./NecroEdit` in the installation path.

Expand All @@ -67,8 +66,7 @@ cmake .
make
```

Development versions of [SFML 2.3](http://sfml-dev.org) (and its dependencies), [Boost](http://boost.org) System and
Boost Filesystem must be installed.
Library and header files for [SFML 2.3](http://sfml-dev.org) (and its dependencies) must be installed.

A C++11 compliant compiler such as GCC 4.8 or Visual Studio 2015 is required to build NecroEdit.

Expand Down
2 changes: 1 addition & 1 deletion src/Client/System/NEApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <iostream>

#ifdef WOS_WINDOWS
# include <Windows.h>
# include <windows.h>
# undef MessageBox
#endif

Expand Down
5 changes: 2 additions & 3 deletions src/Shared/Level/Dungeon.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include <boost/filesystem/path.hpp>
#include <SFML/System/Vector2.hpp>
#include <Shared/External/PugiXML/pugixml.hpp>
#include <Shared/Level/Dungeon.hpp>
Expand Down Expand Up @@ -131,7 +130,7 @@ bool Dungeon::loadFromXML(const std::string& filename)

playerCharacter = characterID;

name = dungeonNode.attribute("name").as_string(boost::filesystem::path(filename).stem().string().c_str());
name = dungeonNode.attribute("name").as_string(removeFileExtension(removeFilePath(filename)).c_str());

std::size_t levelCount = dungeonNode.attribute("numLevels").as_uint(0);

Expand Down Expand Up @@ -232,7 +231,7 @@ bool Dungeon::saveToXML(const std::string& filename) const

// Add dungeon attributes.
dungeonNode.append_attribute("character").set_value(playerCharacter + (isStartItemsEnabled() ? 0 : 1000));
dungeonNode.append_attribute("name").set_value(boost::filesystem::path(filename).stem().string().c_str());
dungeonNode.append_attribute("name").set_value(removeFileExtension(removeFilePath(filename)).c_str());
dungeonNode.append_attribute("numLevels").set_value((int) levels.size());

// Add levels.
Expand Down
260 changes: 0 additions & 260 deletions src/Shared/Utils/Memory/WeakPointer.hpp

This file was deleted.

11 changes: 0 additions & 11 deletions src/Shared/Utils/Memory/WeakPointerHolder.hpp

This file was deleted.

Loading

0 comments on commit 1c05577

Please sign in to comment.