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
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
Description: build the library as a shared library
Author: Scott Howard <showard@debian.org> and Bret Curtis <psi29a@gmail.com>
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
index 133f474..8a0b9f7 100644
--- a/CMake/ConfigureBuild.cmake
+++ b/CMake/ConfigureBuild.cmake
@@ -49,7 +49,7 @@ if (UNIX)
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 ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
# configure additional packages
diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
index 40ec351..70529f4 100644
--- a/MyGUIEngine/CMakeLists.txt
+++ b/MyGUIEngine/CMakeLists.txt
@@ -24,7 +24,8 @@ add_definitions(-DMYGUI_BUILD)
# setup MyGUIEngine target
add_library(${PROJECTNAME} ${MYGUI_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
if (NOT ANDROID)
- set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
+ set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}debian1 LINK_INTERFACE_LIBRARIES "")
+ target_link_libraries(${PROJECTNAME} dl)
endif()
if (UNIX)
diff --git a/Platforms/Ogre/OgrePlatform/CMakeLists.txt b/Platforms/Ogre/OgrePlatform/CMakeLists.txt
index a151abc..80338e1 100644
--- a/Platforms/Ogre/OgrePlatform/CMakeLists.txt
+++ b/Platforms/Ogre/OgrePlatform/CMakeLists.txt
@@ -8,7 +8,8 @@ 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)
diff --git a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
index 01fa2bf..e6553f3 100644
--- a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
+++ b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
@@ -19,7 +19,8 @@ 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)
@@ -27,7 +28,7 @@ if (APPLE)
target_link_libraries(${PROJECTNAME} ${OPENGL_gl_LIBRARY} MyGUIEngine)
else ()
# opengl instead of gl makes it compile and work in a libX11-free wayland setup
- target_link_libraries(${PROJECTNAME} ${OPENGL_opengl_LIBRARY} MyGUIEngine)
+ target_link_libraries(${PROJECTNAME} ${OPENGL_opengl_LIBRARY} ${GLEW_LIBRARIES} MyGUIEngine)
endif ()
if (MYGUI_USE_SYSTEM_GLEW)
target_link_libraries(${PROJECTNAME} ${GLEW_LIBRARIES})
diff --git a/Platforms/OpenGL/OpenGLPlatform/MyGUI.OpenGLPlatform.list b/Platforms/OpenGL/OpenGLPlatform/MyGUI.OpenGLPlatform.list
index fee8f10..46905f6 100644
--- a/Platforms/OpenGL/OpenGLPlatform/MyGUI.OpenGLPlatform.list
+++ b/Platforms/OpenGL/OpenGLPlatform/MyGUI.OpenGLPlatform.list
@@ -27,7 +27,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
@@ -35,3 +34,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()
\ No newline at end of file
diff --git a/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt b/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt
index 27d96da..9581b99 100644
--- a/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt
+++ b/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt
@@ -19,7 +19,8 @@ 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)
@@ -27,7 +28,7 @@ if (APPLE)
target_link_libraries(${PROJECTNAME} ${OPENGL_gl_LIBRARY} MyGUIEngine)
else ()
# opengl instead of gl makes it compile and work in a libX11-free wayland setup
- target_link_libraries(${PROJECTNAME} ${OPENGL_opengl_LIBRARY} MyGUIEngine)
+ target_link_libraries(${PROJECTNAME} ${OPENGL_opengl_LIBRARY} ${GLEW_LIBRARIES} MyGUIEngine)
endif ()
if (MYGUI_USE_SYSTEM_GLEW)
target_link_libraries(${PROJECTNAME} ${GLEW_LIBRARIES})
diff --git a/Platforms/OpenGL3/OpenGL3Platform/MyGUI.OpenGL3Platform.list b/Platforms/OpenGL3/OpenGL3Platform/MyGUI.OpenGL3Platform.list
index 17e1c2e..24ef9e4 100644
--- a/Platforms/OpenGL3/OpenGL3Platform/MyGUI.OpenGL3Platform.list
+++ b/Platforms/OpenGL3/OpenGL3Platform/MyGUI.OpenGL3Platform.list
@@ -27,7 +27,6 @@ SOURCE_GROUP("Header Files" FILES
include/MyGUI_OpenGL3VertexBuffer.h
)
SOURCE_GROUP("Source Files" FILES
- include/GL/glew.c
src/MyGUI_OpenGL3DataManager.cpp
src/MyGUI_OpenGL3Platform.cpp
src/MyGUI_OpenGL3RTTexture.cpp
@@ -35,3 +34,6 @@ SOURCE_GROUP("Source Files" FILES
src/MyGUI_OpenGL3Texture.cpp
src/MyGUI_OpenGL3VertexBuffer.cpp
)
+if(NOT MYGUI_USE_SYSTEM_GLEW)
+ set (SOURCE_FILES ${SOURCE_FILES} include/GL/glew.c)
+endif()
\ No newline at end of file
diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt
index c382db1..d5b570a 100644
--- 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)
|
