mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-23 17:38:44 +00:00
merge
This commit is contained in:
commit
2a36e0d914
2 changed files with 10 additions and 4 deletions
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(ig_lighter ${SRC})
|
ADD_EXECUTABLE(ig_lighter ${SRC})
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nel3d nelpacs)
|
TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nelmisc nel3d nelpacs)
|
||||||
NL_DEFAULT_PROPS(ig_lighter "NeL, Tools, 3D: ig_lighter")
|
NL_DEFAULT_PROPS(ig_lighter "NeL, Tools, 3D: ig_lighter")
|
||||||
NL_ADD_RUNTIME_FLAGS(ig_lighter)
|
NL_ADD_RUNTIME_FLAGS(ig_lighter)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/pic)
|
||||||
INCLUDE( ${QT_USE_FILE} )
|
INCLUDE( ${QT_USE_FILE} )
|
||||||
|
|
||||||
FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp)
|
FILE(GLOB TILE_EDIT_SRC *.cpp *.h)
|
||||||
|
FILE(GLOB PIC_SRC pic/*.c pic/*.cpp)
|
||||||
SET(TILE_EDIT_HDR items_edit_dlg.h tile_browser_dlg.h tile_edit_dlg.h tile_rotation_dlg.h tiles_model.h tile_widget.h)
|
SET(TILE_EDIT_HDR items_edit_dlg.h tile_browser_dlg.h tile_edit_dlg.h tile_rotation_dlg.h tiles_model.h tile_widget.h)
|
||||||
SET(TILE_EDIT_UIS tile_widget_qt.ui tile_rotation_qt.ui tile_edit_qt.ui tile_browser_qt.ui items_edit_qt.ui)
|
SET(TILE_EDIT_UIS tile_widget_qt.ui tile_rotation_qt.ui tile_edit_qt.ui tile_browser_qt.ui items_edit_qt.ui)
|
||||||
SET(TILE_EDIT_RCS tile_edit_qt.qrc)
|
SET(TILE_EDIT_RCS tile_edit_qt.qrc)
|
||||||
|
@ -10,7 +11,12 @@ QT4_ADD_RESOURCES( TILE_EDIT_RC_SRCS ${TILE_EDIT_RCS} )
|
||||||
QT4_WRAP_UI( TILE_EDIT_UI_HDRS ${TILE_EDIT_UIS} )
|
QT4_WRAP_UI( TILE_EDIT_UI_HDRS ${TILE_EDIT_UIS} )
|
||||||
QT4_WRAP_CPP( TILE_EDIT_MOC_SRCS ${TILE_EDIT_HDR})
|
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})
|
SOURCE_GROUP(QtResources FILES ${TILE_EDIT_UIS} ${TILE_EDIT_RCS})
|
||||||
|
SOURCE_GROUP(QtGeneratedUiHdr FILES ${TILE_EDIT_UI_HDRS})
|
||||||
|
SOURCE_GROUP(QtGeneratedMocSrc FILES ${TILE_EDIT_MOC_SRCS})
|
||||||
|
SOURCE_GROUP(PICLibrary FILES ${PIC_SRC})
|
||||||
|
|
||||||
|
ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${PIC_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS})
|
||||||
|
|
||||||
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")
|
||||||
|
|
Loading…
Reference in a new issue