nel_build_fix_mac_64bit_macports.patch

rti, 05/10/2010 09:22 pm

Download (3.4 kB)

b/code/nel/CMakeModules/nel.cmake Mon May 10 15:47:44 2010 +0200
120 120 
    IF(WITH_COVERAGE)
121 121 
      SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
122 122 
    ENDIF(WITH_COVERAGE)
123 
    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
123 
    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
124 
    IF(NOT APPLE)
125 
      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lrt")
126 
    ENDIF(NOT APPLE)
124 127 
    SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
125 128 
    SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
126 129 
    SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
b/code/nel/include/nel/misc/common.h Mon May 10 15:47:44 2010 +0200
298 298 
#endif
299 299 






300
300


/// Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id)







301



uint getThreadId();








301


size_t getThreadId();







302
302








303
303


/// Returns a readable string from a vector of bytes. unprintable char are replaced by '?'







304
304


std::string stringFromVector( const std::vector<uint8>& v, bool limited = true );


















b/code/nel/src/3d/driver/opengl/CMakeLists.txt Mon May 10 15:47:44 2010 +0200







9
9


ADD_LIBRARY(${NLDRV_OGL_LIB} SHARED ${SRC})







10
10








11
11


INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})








12









13


IF(APPLE)








14


  INCLUDE_DIRECTORIES("/usr/X11/include")








15


  TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} 








16


    "-L/usr/X11/lib -lX11 -lGL -framework Foundation -framework Carbon")








17


ENDIF(APPLE)








18








12
19


TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES})







13
20


SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES 







14
21


  VERSION ${NL_VERSION}


















b/code/nel/src/misc/common.cpp Mon May 10 15:47:44 2010 +0200







107
107


/*







108
108


 * Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id)







109
109


 */







110



uint getThreadId()








110


size_t getThreadId()







111
111


{







112
112


#ifdef NL_OS_WINDOWS







113
113


	return GetCurrentThreadId();







114
114


#elif defined NL_OS_UNIX







115



	return uint(pthread_self());








115


	return size_t(pthread_self());







116
116


	// doesnt work on linux kernel 2.6	return getpid();







117
117


#endif







118
118



















b/code/nel/src/sound/CMakeLists.txt Mon May 10 15:47:44 2010 +0200







1



FILE(GLOB SRC *.cpp *.h)








1


FILE(GLOB SRC *.cpp *.h driver/sound_driver.cpp driver/buffer.cpp)







2
2








3
3


IF(NOT WIN32)







4
4


  ADD_LIBRARY(nelsound SHARED ${SRC})


















b/code/nel/src/sound/driver/openal/stdopenal.h Mon May 10 15:47:44 2010 +0200







31
31


#include <utility>







32
32


#include <deque>







33
33








34



#include <AL/al.h>







35



#include <AL/alc.h>








34


#ifndef NL_OS_MAC








35


# include <AL/al.h>








36


# include <AL/alc.h>








37


#else








38


# include <al.h>








39


# include <alc.h>








40


#endif







36
41








37
42


#include <nel/misc/common.h>







38
43


#include <nel/misc/debug.h>