Glfw compiled as external library (#1078)

xelatihy · Sep 14, 2020 · f7b52ff · f7b52ff
1 parent 59c38ec
commit f7b52ff
Show file tree

Hide file tree

Showing 78 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,5 +26,6 @@ if(GENERATOR_IS_MULTI_CONFIG)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
 endif(GENERATOR_IS_MULTI_CONFIG)
 
+add_subdirectory(exts)
 add_subdirectory(libs)
 add_subdirectory(apps)
diff --git a/exts/CMakeLists.txt b/exts/CMakeLists.txt
@@ -0,0 +1,3 @@
+if(YOCTO_OPENGL)
+add_subdirectory(glfw)
+endif(YOCTO_OPENGL)
diff --git a/...gui/ext/glfw/CMake/GenerateMappings.cmake → exts/glfw/CMake/GenerateMappings.cmake b/...gui/ext/glfw/CMake/GenerateMappings.cmake → exts/glfw/CMake/GenerateMappings.cmake
diff --git a/.../ext/glfw/CMake/MacOSXBundleInfo.plist.in → exts/glfw/CMake/MacOSXBundleInfo.plist.in b/.../ext/glfw/CMake/MacOSXBundleInfo.plist.in → exts/glfw/CMake/MacOSXBundleInfo.plist.in
diff --git a/...t/glfw/CMake/i686-w64-mingw32-clang.cmake → exts/glfw/CMake/i686-w64-mingw32-clang.cmake b/...t/glfw/CMake/i686-w64-mingw32-clang.cmake → exts/glfw/CMake/i686-w64-mingw32-clang.cmake
diff --git a/...gui/ext/glfw/CMake/i686-w64-mingw32.cmake → exts/glfw/CMake/i686-w64-mingw32.cmake b/...gui/ext/glfw/CMake/i686-w64-mingw32.cmake → exts/glfw/CMake/i686-w64-mingw32.cmake
diff --git a/...xt/glfw/CMake/modules/FindEpollShim.cmake → exts/glfw/CMake/modules/FindEpollShim.cmake b/...xt/glfw/CMake/modules/FindEpollShim.cmake → exts/glfw/CMake/modules/FindEpollShim.cmake
diff --git a/...i/ext/glfw/CMake/modules/FindOSMesa.cmake → exts/glfw/CMake/modules/FindOSMesa.cmake b/...i/ext/glfw/CMake/modules/FindOSMesa.cmake → exts/glfw/CMake/modules/FindOSMesa.cmake
diff --git a/.../CMake/modules/FindWaylandProtocols.cmake → .../CMake/modules/FindWaylandProtocols.cmake b/.../CMake/modules/FindWaylandProtocols.cmake → .../CMake/modules/FindWaylandProtocols.cmake
diff --git a/...xt/glfw/CMake/modules/FindXKBCommon.cmake → exts/glfw/CMake/modules/FindXKBCommon.cmake b/...xt/glfw/CMake/modules/FindXKBCommon.cmake → exts/glfw/CMake/modules/FindXKBCommon.cmake
diff --git a/...glfw/CMake/x86_64-w64-mingw32-clang.cmake → ...glfw/CMake/x86_64-w64-mingw32-clang.cmake b/...glfw/CMake/x86_64-w64-mingw32-clang.cmake → ...glfw/CMake/x86_64-w64-mingw32-clang.cmake
diff --git a/...i/ext/glfw/CMake/x86_64-w64-mingw32.cmake → exts/glfw/CMake/x86_64-w64-mingw32.cmake b/...i/ext/glfw/CMake/x86_64-w64-mingw32.cmake → exts/glfw/CMake/x86_64-w64-mingw32.cmake
diff --git a/libs/yocto_gui/ext/glfw/CMakeLists.txt → exts/glfw/CMakeLists.txt b/libs/yocto_gui/ext/glfw/CMakeLists.txt → exts/glfw/CMakeLists.txt
diff --git a/libs/yocto_gui/ext/glfw/LICENSE.md → exts/glfw/LICENSE.md b/libs/yocto_gui/ext/glfw/LICENSE.md → exts/glfw/LICENSE.md
diff --git a/libs/yocto_gui/ext/glfw/README.md → exts/glfw/README.md b/libs/yocto_gui/ext/glfw/README.md → exts/glfw/README.md
diff --git a/libs/yocto_gui/ext/glfw/include/GLFW/glfw3.h → exts/glfw/include/GLFW/glfw3.h b/libs/yocto_gui/ext/glfw/include/GLFW/glfw3.h → exts/glfw/include/GLFW/glfw3.h
diff --git a/...o_gui/ext/glfw/include/GLFW/glfw3native.h → exts/glfw/include/GLFW/glfw3native.h b/...o_gui/ext/glfw/include/GLFW/glfw3native.h → exts/glfw/include/GLFW/glfw3native.h
diff --git a/libs/yocto_gui/ext/glfw/src/CMakeLists.txt → exts/glfw/src/CMakeLists.txt b/libs/yocto_gui/ext/glfw/src/CMakeLists.txt → exts/glfw/src/CMakeLists.txt
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_init.m → exts/glfw/src/cocoa_init.m b/libs/yocto_gui/ext/glfw/src/cocoa_init.m → exts/glfw/src/cocoa_init.m
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_joystick.h → exts/glfw/src/cocoa_joystick.h b/libs/yocto_gui/ext/glfw/src/cocoa_joystick.h → exts/glfw/src/cocoa_joystick.h
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_joystick.m → exts/glfw/src/cocoa_joystick.m b/libs/yocto_gui/ext/glfw/src/cocoa_joystick.m → exts/glfw/src/cocoa_joystick.m
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_monitor.m → exts/glfw/src/cocoa_monitor.m b/libs/yocto_gui/ext/glfw/src/cocoa_monitor.m → exts/glfw/src/cocoa_monitor.m
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_platform.h → exts/glfw/src/cocoa_platform.h b/libs/yocto_gui/ext/glfw/src/cocoa_platform.h → exts/glfw/src/cocoa_platform.h
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_time.c → exts/glfw/src/cocoa_time.c b/libs/yocto_gui/ext/glfw/src/cocoa_time.c → exts/glfw/src/cocoa_time.c
diff --git a/libs/yocto_gui/ext/glfw/src/cocoa_window.m → exts/glfw/src/cocoa_window.m b/libs/yocto_gui/ext/glfw/src/cocoa_window.m → exts/glfw/src/cocoa_window.m
diff --git a/libs/yocto_gui/ext/glfw/src/context.c → exts/glfw/src/context.c b/libs/yocto_gui/ext/glfw/src/context.c → exts/glfw/src/context.c
diff --git a/libs/yocto_gui/ext/glfw/src/egl_context.c → exts/glfw/src/egl_context.c b/libs/yocto_gui/ext/glfw/src/egl_context.c → exts/glfw/src/egl_context.c
diff --git a/libs/yocto_gui/ext/glfw/src/egl_context.h → exts/glfw/src/egl_context.h b/libs/yocto_gui/ext/glfw/src/egl_context.h → exts/glfw/src/egl_context.h
diff --git a/libs/yocto_gui/ext/glfw/src/glfw3.pc.in → exts/glfw/src/glfw3.pc.in b/libs/yocto_gui/ext/glfw/src/glfw3.pc.in → exts/glfw/src/glfw3.pc.in
diff --git a/...cto_gui/ext/glfw/src/glfw3Config.cmake.in → exts/glfw/src/glfw3Config.cmake.in b/...cto_gui/ext/glfw/src/glfw3Config.cmake.in → exts/glfw/src/glfw3Config.cmake.in
diff --git a/libs/yocto_gui/ext/glfw/src/glfw_config.h.in → exts/glfw/src/glfw_config.h.in b/libs/yocto_gui/ext/glfw/src/glfw_config.h.in → exts/glfw/src/glfw_config.h.in
diff --git a/libs/yocto_gui/ext/glfw/src/glx_context.c → exts/glfw/src/glx_context.c b/libs/yocto_gui/ext/glfw/src/glx_context.c → exts/glfw/src/glx_context.c
diff --git a/libs/yocto_gui/ext/glfw/src/glx_context.h → exts/glfw/src/glx_context.h b/libs/yocto_gui/ext/glfw/src/glx_context.h → exts/glfw/src/glx_context.h
diff --git a/libs/yocto_gui/ext/glfw/src/init.c → exts/glfw/src/init.c b/libs/yocto_gui/ext/glfw/src/init.c → exts/glfw/src/init.c
diff --git a/libs/yocto_gui/ext/glfw/src/input.c → exts/glfw/src/input.c b/libs/yocto_gui/ext/glfw/src/input.c → exts/glfw/src/input.c
diff --git a/libs/yocto_gui/ext/glfw/src/internal.h → exts/glfw/src/internal.h b/libs/yocto_gui/ext/glfw/src/internal.h → exts/glfw/src/internal.h
diff --git a/libs/yocto_gui/ext/glfw/src/linux_joystick.c → exts/glfw/src/linux_joystick.c b/libs/yocto_gui/ext/glfw/src/linux_joystick.c → exts/glfw/src/linux_joystick.c
diff --git a/libs/yocto_gui/ext/glfw/src/linux_joystick.h → exts/glfw/src/linux_joystick.h b/libs/yocto_gui/ext/glfw/src/linux_joystick.h → exts/glfw/src/linux_joystick.h
diff --git a/libs/yocto_gui/ext/glfw/src/mappings.h → exts/glfw/src/mappings.h b/libs/yocto_gui/ext/glfw/src/mappings.h → exts/glfw/src/mappings.h
diff --git a/libs/yocto_gui/ext/glfw/src/mappings.h.in → exts/glfw/src/mappings.h.in b/libs/yocto_gui/ext/glfw/src/mappings.h.in → exts/glfw/src/mappings.h.in
diff --git a/libs/yocto_gui/ext/glfw/src/monitor.c → exts/glfw/src/monitor.c b/libs/yocto_gui/ext/glfw/src/monitor.c → exts/glfw/src/monitor.c
diff --git a/libs/yocto_gui/ext/glfw/src/nsgl_context.h → exts/glfw/src/nsgl_context.h b/libs/yocto_gui/ext/glfw/src/nsgl_context.h → exts/glfw/src/nsgl_context.h
diff --git a/libs/yocto_gui/ext/glfw/src/nsgl_context.m → exts/glfw/src/nsgl_context.m b/libs/yocto_gui/ext/glfw/src/nsgl_context.m → exts/glfw/src/nsgl_context.m
diff --git a/libs/yocto_gui/ext/glfw/src/null_init.c → exts/glfw/src/null_init.c b/libs/yocto_gui/ext/glfw/src/null_init.c → exts/glfw/src/null_init.c
diff --git a/libs/yocto_gui/ext/glfw/src/null_joystick.c → exts/glfw/src/null_joystick.c b/libs/yocto_gui/ext/glfw/src/null_joystick.c → exts/glfw/src/null_joystick.c
diff --git a/libs/yocto_gui/ext/glfw/src/null_joystick.h → exts/glfw/src/null_joystick.h b/libs/yocto_gui/ext/glfw/src/null_joystick.h → exts/glfw/src/null_joystick.h
diff --git a/libs/yocto_gui/ext/glfw/src/null_monitor.c → exts/glfw/src/null_monitor.c b/libs/yocto_gui/ext/glfw/src/null_monitor.c → exts/glfw/src/null_monitor.c
diff --git a/libs/yocto_gui/ext/glfw/src/null_platform.h → exts/glfw/src/null_platform.h b/libs/yocto_gui/ext/glfw/src/null_platform.h → exts/glfw/src/null_platform.h
diff --git a/libs/yocto_gui/ext/glfw/src/null_window.c → exts/glfw/src/null_window.c b/libs/yocto_gui/ext/glfw/src/null_window.c → exts/glfw/src/null_window.c
diff --git a/libs/yocto_gui/ext/glfw/src/osmesa_context.c → exts/glfw/src/osmesa_context.c b/libs/yocto_gui/ext/glfw/src/osmesa_context.c → exts/glfw/src/osmesa_context.c
diff --git a/libs/yocto_gui/ext/glfw/src/osmesa_context.h → exts/glfw/src/osmesa_context.h b/libs/yocto_gui/ext/glfw/src/osmesa_context.h → exts/glfw/src/osmesa_context.h
diff --git a/libs/yocto_gui/ext/glfw/src/posix_thread.c → exts/glfw/src/posix_thread.c b/libs/yocto_gui/ext/glfw/src/posix_thread.c → exts/glfw/src/posix_thread.c
diff --git a/libs/yocto_gui/ext/glfw/src/posix_thread.h → exts/glfw/src/posix_thread.h b/libs/yocto_gui/ext/glfw/src/posix_thread.h → exts/glfw/src/posix_thread.h
diff --git a/libs/yocto_gui/ext/glfw/src/posix_time.c → exts/glfw/src/posix_time.c b/libs/yocto_gui/ext/glfw/src/posix_time.c → exts/glfw/src/posix_time.c
diff --git a/libs/yocto_gui/ext/glfw/src/posix_time.h → exts/glfw/src/posix_time.h b/libs/yocto_gui/ext/glfw/src/posix_time.h → exts/glfw/src/posix_time.h
diff --git a/libs/yocto_gui/ext/glfw/src/vulkan.c → exts/glfw/src/vulkan.c b/libs/yocto_gui/ext/glfw/src/vulkan.c → exts/glfw/src/vulkan.c
diff --git a/libs/yocto_gui/ext/glfw/src/wgl_context.c → exts/glfw/src/wgl_context.c b/libs/yocto_gui/ext/glfw/src/wgl_context.c → exts/glfw/src/wgl_context.c
diff --git a/libs/yocto_gui/ext/glfw/src/wgl_context.h → exts/glfw/src/wgl_context.h b/libs/yocto_gui/ext/glfw/src/wgl_context.h → exts/glfw/src/wgl_context.h
diff --git a/libs/yocto_gui/ext/glfw/src/win32_init.c → exts/glfw/src/win32_init.c b/libs/yocto_gui/ext/glfw/src/win32_init.c → exts/glfw/src/win32_init.c
diff --git a/libs/yocto_gui/ext/glfw/src/win32_joystick.c → exts/glfw/src/win32_joystick.c b/libs/yocto_gui/ext/glfw/src/win32_joystick.c → exts/glfw/src/win32_joystick.c
diff --git a/libs/yocto_gui/ext/glfw/src/win32_joystick.h → exts/glfw/src/win32_joystick.h b/libs/yocto_gui/ext/glfw/src/win32_joystick.h → exts/glfw/src/win32_joystick.h
diff --git a/libs/yocto_gui/ext/glfw/src/win32_monitor.c → exts/glfw/src/win32_monitor.c b/libs/yocto_gui/ext/glfw/src/win32_monitor.c → exts/glfw/src/win32_monitor.c
diff --git a/libs/yocto_gui/ext/glfw/src/win32_platform.h → exts/glfw/src/win32_platform.h b/libs/yocto_gui/ext/glfw/src/win32_platform.h → exts/glfw/src/win32_platform.h
diff --git a/libs/yocto_gui/ext/glfw/src/win32_thread.c → exts/glfw/src/win32_thread.c b/libs/yocto_gui/ext/glfw/src/win32_thread.c → exts/glfw/src/win32_thread.c
diff --git a/libs/yocto_gui/ext/glfw/src/win32_time.c → exts/glfw/src/win32_time.c b/libs/yocto_gui/ext/glfw/src/win32_time.c → exts/glfw/src/win32_time.c
diff --git a/libs/yocto_gui/ext/glfw/src/win32_window.c → exts/glfw/src/win32_window.c b/libs/yocto_gui/ext/glfw/src/win32_window.c → exts/glfw/src/win32_window.c
diff --git a/libs/yocto_gui/ext/glfw/src/window.c → exts/glfw/src/window.c b/libs/yocto_gui/ext/glfw/src/window.c → exts/glfw/src/window.c
diff --git a/libs/yocto_gui/ext/glfw/src/wl_init.c → exts/glfw/src/wl_init.c b/libs/yocto_gui/ext/glfw/src/wl_init.c → exts/glfw/src/wl_init.c
diff --git a/libs/yocto_gui/ext/glfw/src/wl_monitor.c → exts/glfw/src/wl_monitor.c b/libs/yocto_gui/ext/glfw/src/wl_monitor.c → exts/glfw/src/wl_monitor.c
diff --git a/libs/yocto_gui/ext/glfw/src/wl_platform.h → exts/glfw/src/wl_platform.h b/libs/yocto_gui/ext/glfw/src/wl_platform.h → exts/glfw/src/wl_platform.h
diff --git a/libs/yocto_gui/ext/glfw/src/wl_window.c → exts/glfw/src/wl_window.c b/libs/yocto_gui/ext/glfw/src/wl_window.c → exts/glfw/src/wl_window.c
diff --git a/libs/yocto_gui/ext/glfw/src/x11_init.c → exts/glfw/src/x11_init.c b/libs/yocto_gui/ext/glfw/src/x11_init.c → exts/glfw/src/x11_init.c
diff --git a/libs/yocto_gui/ext/glfw/src/x11_monitor.c → exts/glfw/src/x11_monitor.c b/libs/yocto_gui/ext/glfw/src/x11_monitor.c → exts/glfw/src/x11_monitor.c
diff --git a/libs/yocto_gui/ext/glfw/src/x11_platform.h → exts/glfw/src/x11_platform.h b/libs/yocto_gui/ext/glfw/src/x11_platform.h → exts/glfw/src/x11_platform.h
diff --git a/libs/yocto_gui/ext/glfw/src/x11_window.c → exts/glfw/src/x11_window.c b/libs/yocto_gui/ext/glfw/src/x11_window.c → exts/glfw/src/x11_window.c
diff --git a/libs/yocto_gui/ext/glfw/src/xkb_unicode.c → exts/glfw/src/xkb_unicode.c b/libs/yocto_gui/ext/glfw/src/xkb_unicode.c → exts/glfw/src/xkb_unicode.c
diff --git a/libs/yocto_gui/ext/glfw/src/xkb_unicode.h → exts/glfw/src/xkb_unicode.h b/libs/yocto_gui/ext/glfw/src/xkb_unicode.h → exts/glfw/src/xkb_unicode.h
diff --git a/libs/yocto_gui/CMakeLists.txt b/libs/yocto_gui/CMakeLists.txt
@@ -5,7 +5,6 @@ if(YOCTO_OPENGL)
   set(GLFW_BUILD_TESTS OFF CACHE BOOL " " FORCE)
   set(GLFW_BUILD_DOCS OFF CACHE BOOL " " FORCE)
   set(GLFW_INSTALL OFF CACHE BOOL " " FORCE)
-  add_subdirectory(ext/glfw glfw)
 
   add_library(yocto_gui 
     yocto_opengl.h 
@@ -26,6 +25,7 @@ if(YOCTO_OPENGL)
   target_compile_definitions(yocto_gui PRIVATE -DIMGUI_IMPL_OPENGL_LOADER_GLAD)
   set_target_properties(yocto_gui PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES)
 
+  target_include_directories(yocto_gui PRIVATE ${CMAKE_SOURCE_DIR}/exts/glfw/include)
   target_link_libraries(yocto_gui glfw ${OPENGL_gl_LIBRARY})
 
   if(UNIX AND NOT APPLE)