diff options
| author | Socapex <philippe_groarke@yahoo.ca> | 2012-12-29 14:52:48 -0500 |
|---|---|---|
| committer | Socapex <philippe_groarke@yahoo.ca> | 2012-12-29 14:52:48 -0500 |
| commit | da44874127b07449e9c53f19179b99d300384a8b (patch) | |
| tree | 55930f76cebd79e379f9c85dee211a4549accbb7 | |
| parent | 58414be5bf4d1fad092f61851ef106be89b1f81d (diff) | |
| download | manaplus-da44874127b07449e9c53f19179b99d300384a8b.tar.gz manaplus-da44874127b07449e9c53f19179b99d300384a8b.tar.bz2 manaplus-da44874127b07449e9c53f19179b99d300384a8b.tar.xz manaplus-da44874127b07449e9c53f19179b99d300384a8b.zip | |
OS X now compiles with process.cpp
| -rw-r--r-- | Xcode/ManaPlus.xcodeproj/project.pbxproj | 20 | ||||
| -rw-r--r-- | src/utils/process.cpp | 21 |
2 files changed, 18 insertions, 23 deletions
diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj index aad4ffcd2..073a9ed40 100644 --- a/Xcode/ManaPlus.xcodeproj/project.pbxproj +++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj @@ -4634,7 +4634,10 @@ "-DUSE_INTERNALGUICHAN", "-DUSE_OPENGL", ); - OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a"; + OTHER_LDFLAGS = ( + "$(SRCROOT)/libs/libintl.a", + "-headerpad_max_install_names", + ); PRODUCT_NAME = ManaPlus; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; USER_HEADER_SEARCH_PATHS = ""; @@ -4682,7 +4685,10 @@ "-DUSE_INTERNALGUICHAN", "-DUSE_OPENGL", ); - OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a"; + OTHER_LDFLAGS = ( + "$(SRCROOT)/libs/libintl.a", + "-headerpad_max_install_names", + ); PRODUCT_NAME = ManaPlus; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; USER_HEADER_SEARCH_PATHS = ""; @@ -4782,7 +4788,10 @@ "-DUSE_OPENGL", "-DENABLE_NLS", ); - OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a"; + OTHER_LDFLAGS = ( + "$(SRCROOT)/libs/libintl.a", + "-headerpad_max_install_names", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; USER_HEADER_SEARCH_PATHS = ""; @@ -4831,7 +4840,10 @@ "-DUSE_OPENGL", "-DENABLE_NLS", ); - OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a"; + OTHER_LDFLAGS = ( + "$(SRCROOT)/libs/libintl.a", + "-headerpad_max_install_names", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; USER_HEADER_SEARCH_PATHS = ""; diff --git a/src/utils/process.cpp b/src/utils/process.cpp index 8e238b4cc..f284cc7e1 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -102,29 +102,12 @@ bool openBrowser(std::string url) nullptr, SW_SHOWNORMAL) > 32; } -#elif defined(__APPLE__) -int execFileWait(std::string pathName, std::string name, - std::string arg1, std::string arg2, int waitTime) -{ - return -1; -} - -bool execFile(std::string pathName, std::string name, - std::string arg1, std::string arg2) -{ - return false; -} - -bool openBrowser(std::string url) -{ - return false; -} - -#elif defined __linux__ || defined __linux +#elif defined __linux__ || defined __linux || defined __APPLE__ #include <sys/types.h> #include <sys/wait.h> +#include <signal.h> int execFileWait(std::string pathName, std::string name, std::string arg1, std::string arg2, int waitTime) |