From 9821725c6bafeaf4153ab8604e692dfe13cbff09 Mon Sep 17 00:00:00 2001 From: hristo Date: Thu, 14 Jan 2021 00:10:02 +0200 Subject: Big cmake changes (#1514) * Delete emscripten.cmake This file is not needed at this point. EMSDK provides a toolchain file that has a lot more things in it and is better supported. Project currently works fine with the documentation provided in Emscripten SDK on how to build projects. * First pass file separation. The main two files are cleaner now. Only important things can be seen. Major changes include: - raylib_static is now the alias instead of raylib - Repeating segments are removed and pulled into separate files into /cmake - File is reordered to make more sense - Installs are better structured - Library is build into an output directory "raylib" instead of "src" - All public header files are now set as a public header file - Source files need to be listed (it is a bad practice to capture them using wildcards and file globs) - CMakeLists are better commented * Second pass on the example dirs. They are quite complex so I'm more hesitant to do major changes. Also it works pretty well. Noticed that I forgot one of the seperated files and added it into src/CMakeLists.txt. * Returned the header copy as it was convenient to have the public headers copied. * A better description to the variable RAYLIB_IS_MAIN Co-authored-by: Rob Loach * Remove debug message Co-authored-by: Rob Loach * Improvements based on review. * Simplify the install condition to not be platform specific as it was before. Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Remove some CMAKE variables as they don't affect the build in any way Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Rob Loach Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- examples/CMakeLists.txt | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'examples/CMakeLists.txt') diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 57ba74d4..e3ef3a0f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -28,7 +28,6 @@ if (APPLE AND NOT CMAKE_SYSTEM STRLESS "Darwin-18.0.0") add_definitions(-DGL_SILENCE_DEPRECATION) MESSAGE(AUTHOR_WARNING "OpenGL is deprecated starting with macOS 10.14 (Mojave)!") endif() -list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/rlgl_standalone.c) include(CheckIncludeFile) CHECK_INCLUDE_FILE("stdatomic.h" HAVE_STDATOMIC_H) @@ -119,19 +118,5 @@ foreach(example_source ${example_sources}) endif() endforeach() -if (${PLATFORM} MATCHES "Desktop") - # rlgl_standalone can't be linked with raylib because of duplicate rlgl symbols - foreach (example_source "others/rlgl_standalone.c") - # Create the basename for the example - get_filename_component(example_name ${example_source} NAME) - string(REPLACE ".c" "" example_name ${example_name}) - add_executable(${example_name} ${example_source}) - add_dependencies(${example_name} raylib) - target_link_libraries(${example_name} ${raylib_LDFLAGS}) - target_include_directories(${example_name} PRIVATE ${raylib_INCLUDE_DIRS}) - - endforeach() -endif() - # Copy all of the resource files to the destination file(COPY ${example_resources} DESTINATION "resources/") -- cgit v1.2.3