mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Fix freetype include order
WINSDK added a fttypes.h header...
This commit is contained in:
parent
8602783c96
commit
5a297fd58d
2 changed files with 4 additions and 2 deletions
|
@ -715,7 +715,8 @@ SOURCE_GROUP(Stereo FILES
|
||||||
|
|
||||||
NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})
|
NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${LIBOVR_INCLUDE_DIR} ${LIBVR_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
|
||||||
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LIBOVR_INCLUDE_DIR} ${LIBVR_INCLUDE_DIR})
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
|
TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
|
||||||
SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
||||||
|
|
|
@ -3,7 +3,8 @@ FILE(GLOB HEADERS ../../include/nel/cegui/*.h)
|
||||||
|
|
||||||
ADD_LIBRARY(nelceguirenderer SHARED ${HEADERS} ${SRC} nelceguirenderer.def)
|
ADD_LIBRARY(nelceguirenderer SHARED ${HEADERS} ${SRC} nelceguirenderer.def)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${CEGUI_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
|
||||||
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CEGUI_INCLUDE_DIRS})
|
||||||
TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY})
|
TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY})
|
||||||
NL_DEFAULT_PROPS(nelceguirenderer "NeL, Library: CEGUI Renderer")
|
NL_DEFAULT_PROPS(nelceguirenderer "NeL, Library: CEGUI Renderer")
|
||||||
NL_ADD_RUNTIME_FLAGS(nelceguirenderer)
|
NL_ADD_RUNTIME_FLAGS(nelceguirenderer)
|
||||||
|
|
Loading…
Reference in a new issue