diff options
| author | Sky <git@bunnies.cc> | 2013-12-13 14:58:35 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-12-13 14:58:35 +0000 |
| commit | b69351d50d07bab595945d064e4d29b123c19105 (patch) | |
| tree | 5cf6be9ef49ad10a211a0544e5481f36e49a306a /mmc_updater | |
| parent | 979946b7bb2cec808198f9194169ea08cce8bb00 (diff) | |
| parent | 0af6f96c3de54c940799826ff6f3c89bb46f1540 (diff) | |
| download | MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.gz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.lz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.xz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.zip | |
Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop
Diffstat (limited to 'mmc_updater')
| -rw-r--r-- | mmc_updater/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mmc_updater/src/ProcessUtils.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mmc_updater/src/CMakeLists.txt b/mmc_updater/src/CMakeLists.txt index 9b39bb83..d1a32755 100644 --- a/mmc_updater/src/CMakeLists.txt +++ b/mmc_updater/src/CMakeLists.txt @@ -34,7 +34,7 @@ endif() if (UNIX) set(UPDATER_SOURCES ${UPDATER_SOURCES} UpdateDialogAscii.cpp UpdateDialogAscii.h) - add_definitions(-Wall -Werror -Wconversion) + add_definitions(-Wall -Wconversion) if (APPLE) set(MAC_DOCK_ICON_CPP_FILE ${CMAKE_CURRENT_BINARY_DIR}/mac_dock_icon.cpp) set(MAC_INFO_PLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/mac_info_plist.cpp) diff --git a/mmc_updater/src/ProcessUtils.h b/mmc_updater/src/ProcessUtils.h index 9fa10815..e0cc3dc0 100644 --- a/mmc_updater/src/ProcessUtils.h +++ b/mmc_updater/src/ProcessUtils.h @@ -5,6 +5,10 @@ #include <list> #include <string> +#ifndef PLATFORM_WINDOWS +#include <unistd.h> +#endif + /** A set of functions to get information about the current * process and launch new processes. */ |