mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Merge pull request #411 from slvr/master
Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).
This commit is contained in:
commit
79cbfb535e
|
@ -10,6 +10,14 @@ else()
|
||||||
option(USE_NACL "Use NaCl library instead of libsodium")
|
option(USE_NACL "Use NaCl library instead of libsodium")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
#OS X specific
|
||||||
|
if(APPLE)
|
||||||
|
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib)
|
||||||
|
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /opt/local/include)
|
||||||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/opt/local/include" )
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/local/lib")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
find_package(Curses REQUIRED)
|
find_package(Curses REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -29,6 +29,10 @@
|
||||||
#define WAIT_COUNT 30
|
#define WAIT_COUNT 30
|
||||||
#define WAIT_TIME 500
|
#define WAIT_TIME 500
|
||||||
|
|
||||||
|
#ifndef MAP_ANONYMOUS
|
||||||
|
#define MAP_ANONYMOUS MAP_ANON
|
||||||
|
#endif
|
||||||
|
|
||||||
/* first step, second step */
|
/* first step, second step */
|
||||||
#define FIRST_FLAG 0x1
|
#define FIRST_FLAG 0x1
|
||||||
#define SECOND_FLAG 0x2
|
#define SECOND_FLAG 0x2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user