Skip to content

Commit

Permalink
GUI: Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
fdde authored and DrMcCoy committed Dec 29, 2017
1 parent b70d580 commit 5b4a9fd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
16 changes: 6 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,11 @@ find_package(LibLZMA REQUIRED)
include_directories(${LIBLZMA_INCLUDE_DIRS})
list(APPEND PHAETHON_LIBRARIES ${LIBLZMA_LIBRARIES})

find_package(Qt5Core REQUIRED)
find_package(Qt5MultimediaWidgets REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Concurrent REQUIRED)
include_directories(${Qt5Widgets_INCLUDE_DIRS})
include_directories(${Qt5MultimediaWidgets_INCLUDE_DIRS})
include_directories(${Qt5Concurrent_INCLUDE_DIRS})
list(APPEND PHAETHON_LIBRARIES Qt5::Core Qt5::Widgets Qt5::MultimediaWidgets Qt5::Gui Qt5::Concurrent)
find_package(Qt5Widgets)
find_package(Qt5MultimediaWidgets)
find_package(Qt5Concurrent)
include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5MultimediaWidgets_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS})
list(APPEND PHAETHON_LIBRARIES Qt5::Widgets Qt5::MultimediaWidgets Qt5::Concurrent)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

find_package(Iconv REQUIRED)
Expand Down Expand Up @@ -317,7 +313,7 @@ endforeach()

foreach(AM_PROGRAM ${AM_PROGRAMS})
target_compile_features(${AM_PROGRAM} PRIVATE cxx_relaxed_constexpr) # for verdigris
target_link_libraries(${AM_PROGRAM} Qt5::Gui Qt5::Widgets ${PHAETHON_LIBRARIES})
target_link_libraries(${AM_PROGRAM} ${PHAETHON_LIBRARIES})
endforeach()


Expand Down
2 changes: 1 addition & 1 deletion src/gui/resourcetreeitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace GUI {
ResourceTreeItem::ResourceTreeItem(const Common::FileTree::Entry &entry) :
_name(QString::fromUtf8(entry.name.c_str())), _source(entry.isDirectory() ? kSourceDirectory : kSourceFile) {

_path = QString::fromUtf8(entry.path.c_str());
_path = QString::fromUtf8(entry.path.string().c_str());

_archive.data = 0;
_archive.addedMembers = false;
Expand Down

0 comments on commit 5b4a9fd

Please sign in to comment.