mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-22 23:26:15 +00:00
Fixed: Some tools compilation
This commit is contained in:
parent
7a95148eef
commit
b81696a2a1
4 changed files with 11 additions and 15 deletions
|
@ -1,5 +1,4 @@
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/3d/tile_edit_qt/ )
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/)
|
|
||||||
INCLUDE( ${QT_USE_FILE} )
|
INCLUDE( ${QT_USE_FILE} )
|
||||||
|
|
||||||
FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp)
|
FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp)
|
||||||
|
@ -13,8 +12,6 @@ QT4_WRAP_CPP( TILE_EDIT_MOC_SRCS ${TILE_EDIT_HDR})
|
||||||
|
|
||||||
ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS})
|
ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${QT_INCLUDES})
|
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
|
TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
|
||||||
NL_DEFAULT_PROPS(tile_edit_qt "Tools, 3D: Qt Tile Editor")
|
NL_DEFAULT_PROPS(tile_edit_qt "Tools, 3D: Qt Tile Editor")
|
||||||
NL_ADD_RUNTIME_FLAGS(tile_edit_qt)
|
NL_ADD_RUNTIME_FLAGS(tile_edit_qt)
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/misc/message_box_qt/ )
|
INCLUDE_DIRECTORIES(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/misc/message_box_qt/ )
|
|
||||||
INCLUDE( ${QT_USE_FILE} )
|
INCLUDE( ${QT_USE_FILE} )
|
||||||
|
|
||||||
FILE(GLOB MESSAGE_BOX_SRC *.cpp)
|
FILE(GLOB MESSAGE_BOX_SRC *.cpp)
|
||||||
|
@ -9,8 +8,6 @@ SET( QT_USE_QTXML TRUE)
|
||||||
|
|
||||||
ADD_EXECUTABLE(message_box_qt ${MESSAGE_BOX_SRC})
|
ADD_EXECUTABLE(message_box_qt ${MESSAGE_BOX_SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${QT_INCLUDES})
|
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(message_box_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
|
TARGET_LINK_LIBRARIES(message_box_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
|
||||||
NL_DEFAULT_PROPS(message_box_qt "Tools, Misc: Qt Message Box")
|
NL_DEFAULT_PROPS(message_box_qt "Tools, Misc: Qt Message Box")
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/misc/words_dic_qt/ )
|
INCLUDE_DIRECTORIES(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
|
|
||||||
INCLUDE( ${QT_USE_FILE} )
|
INCLUDE( ${QT_USE_FILE} )
|
||||||
|
|
||||||
FILE(GLOB WORDS_DIC_SRC *.cpp)
|
FILE(GLOB WORDS_DIC_SRC *.cpp)
|
||||||
|
@ -22,8 +21,6 @@ QT4_WRAP_CPP( WORDS_DIC_MOC_SRCS ${WORDS_DIC_HDR})
|
||||||
|
|
||||||
ADD_EXECUTABLE(words_dic_qt ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS} ${WORDS_DIC_RC})
|
ADD_EXECUTABLE(words_dic_qt ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS} ${WORDS_DIC_RC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${QT_INCLUDES})
|
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(words_dic_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
|
TARGET_LINK_LIBRARIES(words_dic_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
|
||||||
NL_DEFAULT_PROPS(words_dic_qt "Tools, Misc: Qt Words Dic")
|
NL_DEFAULT_PROPS(words_dic_qt "Tools, Misc: Qt Words Dic")
|
||||||
NL_ADD_RUNTIME_FLAGS(words_dic_qt)
|
NL_ADD_RUNTIME_FLAGS(words_dic_qt)
|
||||||
|
|
|
@ -9,10 +9,15 @@ ADD_SUBDIRECTORY(leveldesign)
|
||||||
ADD_SUBDIRECTORY(patch_gen)
|
ADD_SUBDIRECTORY(patch_gen)
|
||||||
ADD_SUBDIRECTORY(pdr_util)
|
ADD_SUBDIRECTORY(pdr_util)
|
||||||
ADD_SUBDIRECTORY(stats_scan)
|
ADD_SUBDIRECTORY(stats_scan)
|
||||||
ADD_SUBDIRECTORY(sheets_packer)
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(client)
|
IF(WITH_RYZOM_CLIENT)
|
||||||
ADD_SUBDIRECTORY(server)
|
ADD_SUBDIRECTORY(sheets_packer)
|
||||||
|
ADD_SUBDIRECTORY(client)
|
||||||
|
ENDIF(WITH_RYZOM_CLIENT)
|
||||||
|
|
||||||
|
IF(WITH_RYZOM_SERVER)
|
||||||
|
ADD_SUBDIRECTORY(server)
|
||||||
|
ENDIF(WITH_RYZOM_SERVER)
|
||||||
|
|
||||||
# Old stuff that doesn't compile anymore.
|
# Old stuff that doesn't compile anymore.
|
||||||
#ADD_SUBDIRECTORY(occ2huff)
|
#ADD_SUBDIRECTORY(occ2huff)
|
||||||
|
|
Loading…
Reference in a new issue