Merge pull request #8 from manjaro/development

Merge Development into Master

.gitignore

@@ -1,3 +1,12 @@
-*~
-build
-CMakeLists.txt.user
+libmhwd/cmake_install.cmake
+libmhwd/libmhwd.so
+src/cmake_install.cmake
+src/mhwd
+cmake_install.cmake
+CMakeCache.txt
+CMakeFiles
+Makefile
+*.o
+*settings
+*project
+bin/*

CMakeLists.txt

@@ -1,10 +1,16 @@
 cmake_minimum_required (VERSION 2.6) 
 project(mhwd)
 
-SET(CMAKE_INSTALL_PREFIX "/usr/")
+set(EXECUTABLE_OUTPUT_PATH ${mhwd_SOURCE_DIR}/bin)
 
-add_definitions(-Wall)
+set(CMAKE_INSTALL_PREFIX "/usr/")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -Wall -Wextra -Werror")
+
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunreachable-code")
+endif()
 
 add_subdirectory(libmhwd)
-add_subdirectory(mhwd)
+add_subdirectory(src)
 add_subdirectory(scripts)

libmhwd/CMakeLists.txt

@@ -1,18 +1,15 @@
-include_directories(. vita)
+include_directories(. vita ${mhwd_SOURCE_DIR}/src)
 
 ###
 ### mhwd library
 ###
 
 set( LIB_HEADERS
-    mhwd.h
-    mhwd_p.h
     const.h
     vita/string.hpp
 )
 
 set( LIB_SOURCES
-    mhwd.cpp
     vita/string.cpp
 )
 
@@ -26,6 +23,3 @@ target_link_libraries(mhwd ${LIB_LIBS})
 INSTALL(TARGETS mhwd
   LIBRARY DESTINATION lib
 )
-
-INSTALL(FILES mhwd.h
-  DESTINATION /usr/include)