Merge branch 'trunk' of github.com:lrre-foss/rnr into trunk
This commit is contained in:
commit
4417e3b8cb
|
|
@ -1 +1 @@
|
||||||
Subproject commit e25de95445f2d635a125ab463426bb7fda017093
|
Subproject commit 218159140c7d79ae745e646da721d12331f536f5
|
||||||
|
|
@ -21,9 +21,11 @@ qt_add_executable(Player ${SOURCE} ${HEADER})
|
||||||
target_include_directories(Player PRIVATE Header)
|
target_include_directories(Player PRIVATE Header)
|
||||||
target_link_libraries(Player PRIVATE Common Engine)
|
target_link_libraries(Player PRIVATE Common Engine)
|
||||||
|
|
||||||
set_target_properties(Player PROPERTIES
|
set_target_properties(Player PROPERTIES OUTPUT_NAME "RNR.Player")
|
||||||
OUTPUT_NAME "RNR.Player"
|
|
||||||
|
|
||||||
WIN32_EXECUTABLE ON
|
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
MACOSX_BUNDLE ON
|
set_target_properties(Player PROPERTIES
|
||||||
)
|
WIN32_EXECUTABLE ON
|
||||||
|
MACOSX_BUNDLE ON
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
@ -23,9 +23,11 @@ qt_add_executable(Studio ${SOURCE} ${HEADER})
|
||||||
target_include_directories(Studio PRIVATE Header)
|
target_include_directories(Studio PRIVATE Header)
|
||||||
target_link_libraries(Studio PRIVATE Common Engine)
|
target_link_libraries(Studio PRIVATE Common Engine)
|
||||||
|
|
||||||
set_target_properties(Studio PROPERTIES
|
set_target_properties(Studio PROPERTIES OUTPUT_NAME "RNR.Studio")
|
||||||
OUTPUT_NAME "RNR.Studio"
|
|
||||||
|
|
||||||
WIN32_EXECUTABLE ON
|
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
MACOSX_BUNDLE ON
|
set_target_properties(Studio PROPERTIES
|
||||||
)
|
WIN32_EXECUTABLE ON
|
||||||
|
MACOSX_BUNDLE ON
|
||||||
|
)
|
||||||
|
endif()
|
||||||
Loading…
Reference in New Issue