Fixed Mac build

Peter Wortmann 2011-05-21 16:38:54 +01:00
parent 27d3869ca3
commit bfb0849fe5
3 changed files with 5 additions and 1 deletions

View File

@ -731,6 +731,8 @@ SET(JPEG_NAMES ${JPEG_NAMES} libjpeg)
include(FindJPEG)
include(FindPNG)
include(FindZLIB)
include_directories(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
find_package("Boost" 1.40.0)
if(NOT Boost_INCLUDE_DIR)
message(SEND_ERROR "Could not find the Boost C++ Libraries")

View File

@ -27,6 +27,8 @@
#include <StdWindow.h>
#include <string>
#include "StdApp.h"
bool CStdApp::Copy(const StdStrBuf & text, bool fClipboard)
{
NSPasteboard* pasteboard = [NSPasteboard generalPasteboard];

View File

@ -244,7 +244,7 @@ bool StdScheduler::ScheduleProcs(int iTimeout)
// Initialize file descriptor sets
std::vector<struct pollfd> fds;
std::map<StdSchedulerProc *, std::pair<unsigned int, unsigned int>> fds_for_proc;
std::map<StdSchedulerProc *, std::pair<unsigned int, unsigned int> > fds_for_proc;
// Collect file descriptors
for (i = 0; i < iProcCnt; i++)