diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/config.h | 9 | ||||
| -rw-r--r-- | src/config.h.in | 91 | ||||
| -rw-r--r-- | src/rlgl.h | 2 |
4 files changed, 2 insertions, 107 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a11f4efb..bcef058b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,11 +83,7 @@ if (${PLATFORM} MATCHES "Desktop") target_link_libraries(raylib glfw) endif () -# Adding compile definitions -target_compile_definitions(raylib - PUBLIC "${PLATFORM_CPP}" - PUBLIC "${GRAPHICS}" - ) +include(CompileDefinitions) # Registering include directories target_include_directories(raylib @@ -96,7 +92,6 @@ target_include_directories(raylib $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} # For cmake/config.h ${OPENGL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} ) diff --git a/src/config.h b/src/config.h index dbe77cd9..f7380422 100644 --- a/src/config.h +++ b/src/config.h @@ -27,12 +27,6 @@ #define RAYLIB_VERSION "3.5" -// Edit to control what features Makefile'd raylib is compiled with -#if defined(RAYLIB_CMAKE) - // Edit cmake/RaylibOptions.cmake for CMake instead - #include "cmake/config.h" -#else - //------------------------------------------------------------------------------------ // Module: core - Configuration Flags //------------------------------------------------------------------------------------ @@ -217,6 +211,3 @@ //------------------------------------------------------------------------------------ #define MAX_TRACELOG_MSG_LENGTH 128 // Max length of one trace-log message #define MAX_UWP_MESSAGES 512 // Max UWP messages to process - - -#endif //defined(RAYLIB_CMAKE) diff --git a/src/config.h.in b/src/config.h.in deleted file mode 100644 index 4cb217b5..00000000 --- a/src/config.h.in +++ /dev/null @@ -1,91 +0,0 @@ -// config.h.in - -// core.c -// Camera module is included (camera.h) and multiple predefined cameras are available: free, 1st/3rd person, orbital -#cmakedefine SUPPORT_CAMERA_SYSTEM 1 -// Gestures module is included (gestures.h) to support gestures detection: tap, hold, swipe, drag -#cmakedefine SUPPORT_GESTURES_SYSTEM 1 -// Mouse gestures are directly mapped like touches and processed by gestures system. -#cmakedefine SUPPORT_MOUSE_GESTURES 1 -// Reconfigure standard input to receive key inputs, works with SSH connection. -#cmakedefine SUPPORT_SSH_KEYBOARD_RPI 1 -// Use busy wait loop for timing sync, if not defined, a high-resolution timer is setup and used -#cmakedefine SUPPORT_BUSY_WAIT_LOOP 1 -// Wait for events passively (sleeping while no events) instead of polling them actively every frame -#cmakedefine SUPPORT_EVENTS_WAITING 1 -// Allow automatic screen capture of current screen pressing F12, defined in KeyCallback() -#cmakedefine SUPPORT_SCREEN_CAPTURE 1 -// Allow automatic gif recording of current screen pressing CTRL+F12, defined in KeyCallback() -#cmakedefine SUPPORT_GIF_RECORDING 1 -// Support high DPI displays -#cmakedefine SUPPORT_HIGH_DPI 1 -// Support CompressData() and DecompressData() functions -#cmakedefine SUPPORT_COMPRESSION_API 1 -// Support for persistent data storage -#cmakedefine SUPPORT_DATA_STORAGE 1 - -// rlgl.h -// Support VR simulation functionality (stereo rendering) -#cmakedefine SUPPORT_VR_SIMULATOR 1 - -// shapes.c -// Draw rectangle shapes using font texture white character instead of default white texture -#cmakedefine SUPPORT_FONT_TEXTURE 1 -// Use QUADS instead of TRIANGLES for drawing when possible -// Some lines-based shapes could still use lines -#cmakedefine SUPPORT_QUADS_DRAW_MODE 1 - -// textures.c -// Selecte desired fileformats to be supported for image data loading. -#cmakedefine SUPPORT_FILEFORMAT_PNG 1 -#cmakedefine SUPPORT_FILEFORMAT_DDS 1 -#cmakedefine SUPPORT_FILEFORMAT_HDR 1 -#cmakedefine SUPPORT_FILEFORMAT_KTX 1 -#cmakedefine SUPPORT_FILEFORMAT_ASTC 1 -#cmakedefine SUPPORT_FILEFORMAT_BMP 1 -#cmakedefine SUPPORT_FILEFORMAT_TGA 1 -#cmakedefine SUPPORT_FILEFORMAT_JPG 1 -#cmakedefine SUPPORT_FILEFORMAT_GIF 1 -#cmakedefine SUPPORT_FILEFORMAT_PSD 1 -#cmakedefine SUPPORT_FILEFORMAT_PKM 1 -#cmakedefine SUPPORT_FILEFORMAT_PVR 1 -// Support image export functionality (.png, .bmp, .tga, .jpg) -#define SUPPORT_IMAGE_EXPORT 1 -// Support multiple image editing functions to scale, adjust colors, flip, draw on images, crop... If not defined only three image editing functions supported: ImageFormat(), ImageAlphaMask(), ImageToPOT() -#cmakedefine SUPPORT_IMAGE_MANIPULATION 1 -// Support procedural image generation functionality (gradient, spot, perlin-noise, cellular) -#cmakedefine SUPPORT_IMAGE_GENERATION 1 - -// text.c -// Default font is loaded on window initialization to be available for the user to render simple text. NOTE: If enabled, uses external module functions to load default raylib font (module: text) -#cmakedefine SUPPORT_DEFAULT_FONT 1 -// Selected desired fileformats to be supported for loading. -#cmakedefine SUPPORT_FILEFORMAT_FNT 1 -#cmakedefine SUPPORT_FILEFORMAT_TTF 1 -// Support text management functions -// If not defined, still some functions are supported: TextLength(), TextFormat() -#cmakedefine SUPPORT_TEXT_MANIPULATION 1 - -// models.c -// Selected desired fileformats to be supported for loading. -#cmakedefine SUPPORT_FILEFORMAT_OBJ 1 -#cmakedefine SUPPORT_FILEFORMAT_MTL 1 -#cmakedefine SUPPORT_FILEFORMAT_IQM 1 -#cmakedefine SUPPORT_FILEFORMAT_GLTF 1 -// Support procedural mesh generation functions, uses external par_shapes.h library -// NOTE: Some generated meshes DO NOT include generated texture coordinates -#cmakedefine SUPPORT_MESH_GENERATION 1 - -// raudio.c -// Desired fileformats to be supported for loading. -#cmakedefine SUPPORT_FILEFORMAT_WAV 1 -#cmakedefine SUPPORT_FILEFORMAT_OGG 1 -#cmakedefine SUPPORT_FILEFORMAT_XM 1 -#cmakedefine SUPPORT_FILEFORMAT_MOD 1 -#cmakedefine SUPPORT_FILEFORMAT_FLAC 1 -#cmakedefine SUPPORT_FILEFORMAT_MP3 1 - -// utils.c -// Show TraceLog() output messages. NOTE: By default LOG_DEBUG traces not shown -#cmakedefine SUPPORT_TRACELOG 1 - @@ -840,7 +840,7 @@ typedef struct RenderBatch { float currentDepth; // Current depth value for next draw } RenderBatch; -#if defined(SUPPORT_VR_SIMULATOR) +#if defined(SUPPORT_VR_SIMULATOR) && !defined(RLGL_STANDALONE) // VR Stereo rendering configuration for simulator typedef struct VrStereoConfig { Shader distortionShader; // VR stereo rendering distortion shader |