forked from bartvdbraak/blender
405cf80eb8
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
the old BMF api.
I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.
MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
Always have to link/include the freetype2 library
Remove any reference to libbmfont
Remove any reference to libftfont
Remove any reference to libbftgl (or libbFTGL)
103 lines
3.1 KiB
CMake
103 lines
3.1 KiB
CMake
MACRO(BLENDERLIB_NOLIST
|
|
name
|
|
sources
|
|
includes)
|
|
|
|
# Gather all headers
|
|
FILE(GLOB_RECURSE INC_ALL *.h)
|
|
|
|
INCLUDE_DIRECTORIES(${includes})
|
|
ADD_LIBRARY(${name} ${INC_ALL} ${sources})
|
|
|
|
# Group by location on disk
|
|
SOURCE_GROUP(Files FILES CMakeLists.txt)
|
|
SET(ALL_FILES ${sources} ${INC_ALL})
|
|
FOREACH(SRC ${ALL_FILES})
|
|
STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
|
|
STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
|
|
STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
|
|
IF(REL_DIR)
|
|
SOURCE_GROUP(${REL_DIR} FILES ${SRC})
|
|
ELSE(REL_DIR)
|
|
SOURCE_GROUP(Files FILES ${SRC})
|
|
ENDIF(REL_DIR)
|
|
ENDFOREACH(SRC)
|
|
|
|
MESSAGE(STATUS "Configuring library ${name}")
|
|
ENDMACRO(BLENDERLIB_NOLIST)
|
|
|
|
MACRO(BLENDERLIB
|
|
name
|
|
sources
|
|
includes)
|
|
|
|
BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
|
|
|
|
# Add to blender's list of libraries
|
|
FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
|
|
ENDMACRO(BLENDERLIB)
|
|
|
|
MACRO(SETUP_LIBDIRS)
|
|
# see "cmake --help-policy CMP0003"
|
|
if(COMMAND cmake_policy)
|
|
CMAKE_POLICY(SET CMP0003 NEW)
|
|
endif(COMMAND cmake_policy)
|
|
LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
|
|
LINK_DIRECTORIES(${FREETYPE_LIBPATH})
|
|
IF(WITH_INTERNATIONAL)
|
|
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
|
|
ENDIF(WITH_INTERNATIONAL)
|
|
IF(WITH_OPENAL)
|
|
LINK_DIRECTORIES(${OPENAL_LIBPATH})
|
|
ENDIF(WITH_OPENAL)
|
|
|
|
IF(WIN32)
|
|
LINK_DIRECTORIES(${PTHREADS_LIBPATH})
|
|
ENDIF(WIN32)
|
|
ENDMACRO(SETUP_LIBDIRS)
|
|
|
|
MACRO(SETUP_LIBLINKS
|
|
target)
|
|
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
|
|
TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
|
|
|
|
TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
|
|
TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
|
|
|
|
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
|
|
|
|
IF(WIN32)
|
|
|
|
TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
|
|
|
|
TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
|
|
|
|
ELSE(WIN32)
|
|
|
|
TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
|
|
|
|
ENDIF(WIN32)
|
|
|
|
IF(WITH_INTERNATIONAL)
|
|
TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
|
|
ENDIF(WITH_INTERNATIONAL)
|
|
IF(WITH_OPENAL)
|
|
TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIB})
|
|
ENDIF(WITH_OPENAL)
|
|
IF(WIN32)
|
|
TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
|
|
ENDIF(WIN32)
|
|
IF(WITH_QUICKTIME)
|
|
TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
|
|
ENDIF(WITH_QUICKTIME)
|
|
IF(WITH_OPENEXR)
|
|
TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
|
|
ENDIF(WITH_OPENEXR)
|
|
IF(WITH_FFMPEG)
|
|
TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
|
|
ENDIF(WITH_FFMPEG)
|
|
IF(WIN32)
|
|
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
|
|
ENDIF(WIN32)
|
|
ENDMACRO(SETUP_LIBLINKS)
|