pool/MyGUI
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5a1614c6c4
MyGUI/MyGUI-lib_suffix.patch

55 lines
2.6 KiB
Diff
Raw Normal View History

Accepting request 789453 from home:cgiboudeaux:branches:games - Run spec-cleaner - Update to 3.4: * Added LanguageManager::getLanguages * Fix lost key focus event not being triggered sometimes * Fix inconsistency: _riseMouseButtonMove was using Layer coordinates (most of the time). _riseMouseButtonReleased/Pressed were using absolute coordinates. * Other InputManager events fixes. * Minor MacOS build fixes. * Cleaner and much faster logic for adding and removing render items (it was the performance bottleneck when working with many items on screen). * ScrollBar: Fixed wrong tracking area bug. * Button: make Button with key focus (can be set only manually through code) have highlighted state. * ItemBox: add possibility to not update ItemBox content when working with items (huge speed boost, when adding/removing many in single frame) * EditText: add support for alpha in text and text shadow colours (multiplied with widget's alpha). * ItemBox: add options to hide ItemBox scroll bars (same as for ScrollView and EditBox). * MultiListBox: slightly advanced and more flexible custom compare function. * EditBox: add Ctrl+Left/Right hotkey support (moves cursor to next word). * MultiListBox: add eventNotifyItem. * OpenGL3Platform: Added new rendering platform. * OpenGLESPlatform: Added new rendering platform. * Emscripten support (works for Ogre and all OpenGL OBS-URL: https://build.opensuse.org/request/show/789453 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=22
2020-03-29 16:14:26 +02:00
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
index 9c6aad9..74fe84f 100644
--- a/CMake/ConfigureBuild.cmake
+++ b/CMake/ConfigureBuild.cmake
@@ -47,7 +47,7 @@ if (UNIX)
Accepting request 66573 from home:Ansus:games OBS-URL: https://build.opensuse.org/request/show/66573 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=1
2011-04-20 15:32:42 +02:00
else ()
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
endif ()
- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
# configure additional packages
Accepting request 789453 from home:cgiboudeaux:branches:games - Run spec-cleaner - Update to 3.4: * Added LanguageManager::getLanguages * Fix lost key focus event not being triggered sometimes * Fix inconsistency: _riseMouseButtonMove was using Layer coordinates (most of the time). _riseMouseButtonReleased/Pressed were using absolute coordinates. * Other InputManager events fixes. * Minor MacOS build fixes. * Cleaner and much faster logic for adding and removing render items (it was the performance bottleneck when working with many items on screen). * ScrollBar: Fixed wrong tracking area bug. * Button: make Button with key focus (can be set only manually through code) have highlighted state. * ItemBox: add possibility to not update ItemBox content when working with items (huge speed boost, when adding/removing many in single frame) * EditText: add support for alpha in text and text shadow colours (multiplied with widget's alpha). * ItemBox: add options to hide ItemBox scroll bars (same as for ScrollView and EditBox). * MultiListBox: slightly advanced and more flexible custom compare function. * EditBox: add Ctrl+Left/Right hotkey support (moves cursor to next word). * MultiListBox: add eventNotifyItem. * OpenGL3Platform: Added new rendering platform. * OpenGLESPlatform: Added new rendering platform. * Emscripten support (works for Ogre and all OpenGL OBS-URL: https://build.opensuse.org/request/show/789453 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=22
2020-03-29 16:14:26 +02:00
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index bba3f91..0f6d842 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -34,8 +34,8 @@ endif ()
Accepting request 286512 from home:openSUSE_user1 Update to current upstream version 3.2.2. OBS-URL: https://build.opensuse.org/request/show/286512 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=12
2015-02-17 20:30:27 +01:00
function(mygui_install_target TARGETNAME SUFFIX)
install(TARGETS ${TARGETNAME}
RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
Accepting request 789453 from home:cgiboudeaux:branches:games - Run spec-cleaner - Update to 3.4: * Added LanguageManager::getLanguages * Fix lost key focus event not being triggered sometimes * Fix inconsistency: _riseMouseButtonMove was using Layer coordinates (most of the time). _riseMouseButtonReleased/Pressed were using absolute coordinates. * Other InputManager events fixes. * Minor MacOS build fixes. * Cleaner and much faster logic for adding and removing render items (it was the performance bottleneck when working with many items on screen). * ScrollBar: Fixed wrong tracking area bug. * Button: make Button with key focus (can be set only manually through code) have highlighted state. * ItemBox: add possibility to not update ItemBox content when working with items (huge speed boost, when adding/removing many in single frame) * EditText: add support for alpha in text and text shadow colours (multiplied with widget's alpha). * ItemBox: add options to hide ItemBox scroll bars (same as for ScrollView and EditBox). * MultiListBox: slightly advanced and more flexible custom compare function. * EditBox: add Ctrl+Left/Right hotkey support (moves cursor to next word). * MultiListBox: add eventNotifyItem. * OpenGL3Platform: Added new rendering platform. * OpenGLESPlatform: Added new rendering platform. * Emscripten support (works for Ogre and all OpenGL OBS-URL: https://build.opensuse.org/request/show/789453 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=22
2020-03-29 16:14:26 +02:00
@@ -61,8 +61,8 @@ endfunction(mygui_install_target)
Accepting request 286512 from home:openSUSE_user1 Update to current upstream version 3.2.2. OBS-URL: https://build.opensuse.org/request/show/286512 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=12
2015-02-17 20:30:27 +01:00
# setup common target settings
function(mygui_config_common TARGETNAME)
set_target_properties(${TARGETNAME} PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
- LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+ ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+ LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
)
Accepting request 789453 from home:cgiboudeaux:branches:games - Run spec-cleaner - Update to 3.4: * Added LanguageManager::getLanguages * Fix lost key focus event not being triggered sometimes * Fix inconsistency: _riseMouseButtonMove was using Layer coordinates (most of the time). _riseMouseButtonReleased/Pressed were using absolute coordinates. * Other InputManager events fixes. * Minor MacOS build fixes. * Cleaner and much faster logic for adding and removing render items (it was the performance bottleneck when working with many items on screen). * ScrollBar: Fixed wrong tracking area bug. * Button: make Button with key focus (can be set only manually through code) have highlighted state. * ItemBox: add possibility to not update ItemBox content when working with items (huge speed boost, when adding/removing many in single frame) * EditText: add support for alpha in text and text shadow colours (multiplied with widget's alpha). * ItemBox: add options to hide ItemBox scroll bars (same as for ScrollView and EditBox). * MultiListBox: slightly advanced and more flexible custom compare function. * EditBox: add Ctrl+Left/Right hotkey support (moves cursor to next word). * MultiListBox: add eventNotifyItem. * OpenGL3Platform: Added new rendering platform. * OpenGLESPlatform: Added new rendering platform. * Emscripten support (works for Ogre and all OpenGL OBS-URL: https://build.opensuse.org/request/show/789453 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=22
2020-03-29 16:14:26 +02:00
endfunction(mygui_config_common)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35658d9..f94482f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,8 +81,8 @@ endif ()
Accepting request 286512 from home:openSUSE_user1 Update to current upstream version 3.2.2. OBS-URL: https://build.opensuse.org/request/show/286512 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=12
2015-02-17 20:30:27 +01:00
set(MYGUI_LIBRARIES MyGUIEngine)
# Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
if (WIN32 OR APPLE)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
Reference in New Issue Copy Permalink