diff options
| author | hristo <[email protected]> | 2021-01-14 00:10:02 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-13 23:10:02 +0100 |
| commit | 9821725c6bafeaf4153ab8604e692dfe13cbff09 (patch) | |
| tree | 5dc264f722473f8f5f6c48dcfb4d1ada5761f501 /cmake/emscripten.cmake | |
| parent | 3d22709808fd9ba2843e6cad5e106bcd90eecaca (diff) | |
| download | raylib-9821725c6bafeaf4153ab8604e692dfe13cbff09.tar.gz raylib-9821725c6bafeaf4153ab8604e692dfe13cbff09.zip | |
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 <root>/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 <[email protected]>
* Remove debug message
Co-authored-by: Rob Loach <[email protected]>
* Improvements based on review.
* Simplify the install condition to not be platform specific as it was before.
Co-authored-by: Alexander Neumann <[email protected]>
* Remove some CMAKE variables as they don't affect the build in any way
Co-authored-by: Alexander Neumann <[email protected]>
Co-authored-by: Rob Loach <[email protected]>
Co-authored-by: Alexander Neumann <[email protected]>
Diffstat (limited to 'cmake/emscripten.cmake')
| -rw-r--r-- | cmake/emscripten.cmake | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/cmake/emscripten.cmake b/cmake/emscripten.cmake deleted file mode 100644 index 1780dee9..00000000 --- a/cmake/emscripten.cmake +++ /dev/null @@ -1,23 +0,0 @@ -SET(CMAKE_SYSTEM_NAME Linux) -SET(CMAKE_SYSTEM_PROCESSOR x86) - -if (CMAKE_HOST_WIN32) - SET(EMSCRIPTEN_EXTENSION ".bat") -else () - SET(EMSCRIPTEN_EXTENSION "") -endif() - -SET(CMAKE_C_COMPILER emcc${EMSCRIPTEN_EXTENSION}) -SET(CMAKE_CXX_COMPILER em++${EMSCRIPTEN_EXTENSION}) - -if(NOT DEFINED CMAKE_AR) - find_program(CMAKE_AR NAMES emar${EMSCRIPTEN_EXTENSION}) -endif() -if(NOT DEFINED CMAKE_RANLIB) - find_program(CMAKE_RANLIB NAMES emranlib${EMSCRIPTEN_EXTENSION}) -endif() - -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) |
