1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
Description: build the library as a shared library
Author: Scott Howard <showard@debian.org>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,7 @@ endif(WIN32 OR APPLE)
# Customise what to build
option(MYGUI_STATIC "Static build" FALSE)
option(MYGUI_USE_FREETYPE "Use freetype for font rendering" TRUE)
+option(MYGUI_USE_SYSTEM_GLEW "Use system OpenGL Extension Wrangler Library (GLEW)" FALSE)
option(MYGUI_DONT_USE_OBSOLETE "Remove obsole functions from build" FALSE)
set(MYGUI_RENDERSYSTEM 3 CACHE STRING
--- a/Platforms/Ogre/OgrePlatform/CMakeLists.txt
+++ b/Platforms/Ogre/OgrePlatform/CMakeLists.txt
@@ -8,11 +8,12 @@ include_directories(
include(${PROJECTNAME}.list)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
+set_target_properties(${PROJECTNAME} PROPERTIES VERSION 0debian1.0.0 SOVERSION 0debian1)
add_dependencies(${PROJECTNAME} MyGUIEngine)
-target_link_libraries(${PROJECTNAME} ${OGRE_LIBRARIES} MyGUIEngine)
+target_link_libraries(${PROJECTNAME} ${OGRE_LIBRARIES} MyGUIEngine boost_system)
link_directories(${OGRE_LIB_DIR})
# installation rules
--- a/Plugins/CMakeLists.txt
+++ b/Plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
option(MYGUI_BUILD_HIKARI_PLUGIN "Build Plugin HikariWidget" FALSE)
option(MYGUI_BUILD_BERKELIUM_PLUGIN "Build Plugin BerkeliumWidget" FALSE)
-add_subdirectory(Plugin_StrangeButton)
+#add_subdirectory(Plugin_StrangeButton)
if (MYGUI_BUILD_HIKARI_PLUGIN)
if (WIN32)
--- a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
+++ b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
@@ -17,11 +17,12 @@ if(NOT MYGUI_USE_SYSTEM_GLEW)
endif()
add_definitions(-DGL_GLEXT_PROTOTYPES)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
+set_target_properties(${PROJECTNAME} PROPERTIES VERSION 0debian1.0.0 SOVERSION 0debian1)
add_dependencies(${PROJECTNAME} MyGUIEngine)
-target_link_libraries(${PROJECTNAME} ${OPENGL_gl_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} MyGUIEngine)
+target_link_libraries(${PROJECTNAME} ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} MyGUIEngine)
if(MYGUI_USE_SYSTEM_GLEW)
target_link_libraries(${PROJECTNAME} ${GLEW_LIBRARIES})
endif()
--- a/Platforms/OpenGL/OpenGLPlatform/MyGUI.OpenGLPlatform.list
+++ b/Platforms/OpenGL/OpenGLPlatform/MyGUI.OpenGLPlatform.list
@@ -25,7 +25,6 @@ SOURCE_GROUP("Header Files" FILES
include/MyGUI_OpenGLVertexBuffer.h
)
SOURCE_GROUP("Source Files" FILES
- include/GL/glew.c
src/MyGUI_OpenGLDataManager.cpp
src/MyGUI_OpenGLPlatform.cpp
src/MyGUI_OpenGLRTTexture.cpp
@@ -33,3 +32,6 @@ SOURCE_GROUP("Source Files" FILES
src/MyGUI_OpenGLTexture.cpp
src/MyGUI_OpenGLVertexBuffer.cpp
)
+if(NOT MYGUI_USE_SYSTEM_GLEW)
+ set (SOURCE_FILES ${SOURCE_FILES} include/GL/glew.c)
+endif()
--- a/MyGUIEngine/CMakeLists.txt
+++ b/MyGUIEngine/CMakeLists.txt
@@ -24,7 +24,8 @@ endif ()
# setup MyGUIEngine target
add_library(${PROJECTNAME} ${MYGUI_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
-set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR})
+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}debian1 LINK_INTERFACE_LIBRARIES "")
+target_link_libraries(${PROJECTNAME} dl)
if (UNIX)
# some platforms require explicit linking to libdl, see if it's available
--- a/CMake/Dependencies.cmake
+++ b/CMake/Dependencies.cmake
@@ -60,6 +60,10 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 4)
#find_package(PNG)
#macro_log_feature(PNG_FOUND "PNG" "Png image codec" "http://www.libpng.org/" TRUE "" "")
find_package(OpenGL)
+ if(MYGUI_USE_SYSTEM_GLEW)
+ find_package(GLEW)
+ macro_log_feature(GLEW_FOUND "GLEW" "OpenGL Extension Wrangler Library" "" TRUE "" "")
+ endif()
macro_log_feature(OPENGL_FOUND "opengl" "Support for the OpenGL render system" "" TRUE "" "")
if(MYGUI_USE_SYSTEM_GLEW)
find_package(GLEW)
|
