Browse Source
Removing config.h.in file (#1546)
CMake relied on this file for configurations and also was interfering in the regular config.h by having a separate definition if building with CMake. This was not entirely correct so instead we will define compile time definitions separately through CMake (CompileDefinitions.cmake) and also will use the provided EXTERNAL_CONFIG_FLAGS that I found that will not use config.h in through the build process. I also introduced a new compiler option (CUSTOMIZE_BUILD) that when OFF will use the default config.h and when ON will show other options for redefining your own options. Fixed an error in rlgl.h where if you have both RLGL_STANDALONE and SUPPORT_VR_SIMULATOR you get a compile time error.pull/1549/head
hristo
3 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 158 additions and 157 deletions
Split View
Diff Options
-
+47 -45CMakeOptions.txt
-
+109 -0cmake/CompileDefinitions.cmake
-
+0 -5cmake/LibraryConfigurations.cmake
-
+1 -6src/CMakeLists.txt
-
+0 -9src/config.h
-
+0 -91src/config.h.in
-
+1 -1src/rlgl.h
+ 47
- 45
CMakeOptions.txt
View File
+ 109
- 0
cmake/CompileDefinitions.cmake
View File
| @ -0,0 +1,109 @@ | |||
| # Adding compile definitions | |||
| target_compile_definitions("raylib" PUBLIC "${PLATFORM_CPP}") | |||
| target_compile_definitions("raylib" PUBLIC "${GRAPHICS}") | |||
| function(define_if target variable) | |||
| if (${${variable}}) | |||
| target_compile_definitions(${target} PUBLIC "${variable}") | |||
| endif () | |||
| endfunction() | |||
| if (${CUSTOMIZE_BUILD}) | |||
| target_compile_definitions("raylib" PUBLIC EXTERNAL_CONFIG_FLAGS) | |||
| define_if("raylib" SUPPORT_CAMERA_SYSTEM) | |||
| define_if("raylib" SUPPORT_GESTURES_SYSTEM) | |||
| define_if("raylib" SUPPORT_MOUSE_GESTURES) | |||
| define_if("raylib" SUPPORT_SSH_KEYBOARD_RPI) | |||
| define_if("raylib" SUPPORT_BUSY_WAIT_LOOP) | |||
| define_if("raylib" SUPPORT_EVENTS_WAITING) | |||
| define_if("raylib" SUPPORT_SCREEN_CAPTURE) | |||
| define_if("raylib" SUPPORT_GIF_RECORDING) | |||
| define_if("raylib" SUPPORT_HIGH_DPI) | |||
| define_if("raylib" SUPPORT_COMPRESSION_API) | |||
| define_if("raylib" SUPPORT_DATA_STORAGE) | |||
| define_if("raylib" SUPPORT_VR_SIMULATOR) | |||
| define_if("raylib" SUPPORT_FONT_TEXTURE) | |||
| define_if("raylib" SUPPORT_QUADS_DRAW_MODE) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_PNG) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_DDS) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_HDR) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_KTX) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_ASTC) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_BMP) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_TGA) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_JPG) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_GIF) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_PSD) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_PKM) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_PVR) | |||
| define_if("raylib" ORT_IMAGE_EXPORT) | |||
| define_if("raylib" SUPPORT_IMAGE_MANIPULATION) | |||
| define_if("raylib" SUPPORT_IMAGE_GENERATION) | |||
| define_if("raylib" SUPPORT_DEFAULT_FONT) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_FNT) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_TTF) | |||
| define_if("raylib" SUPPORT_TEXT_MANIPULATION) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_OBJ) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_MTL) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_IQM) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_GLTF) | |||
| define_if("raylib" SUPPORT_MESH_GENERATION) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_WAV) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_OGG) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_XM) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_MOD) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_FLAC) | |||
| define_if("raylib" SUPPORT_FILEFORMAT_MP3) | |||
| define_if("raylib" SUPPORT_TRACELOG) | |||
| define_if("raylib" SUPPORT_COMPRESSION_API) | |||
| if (UNIX AND NOT APPLE) | |||
| target_compile_definitions("raylib" PUBLIC "MAX_FILEPATH_LENGTH=4096") | |||
| else () | |||
| target_compile_definitions("raylib" PUBLIC "MAX_FILEPATH_LENGTH=512") | |||
| endif () | |||
| target_compile_definitions("raylib" PUBLIC "MAX_GAMEPADS=4") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_GAMEPAD_AXIS=8") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_GAMEPAD_BUTTONS=32") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_TOUCH_POINTS=10") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_KEY_PRESSED_QUEUE=16") | |||
| target_compile_definitions("raylib" PUBLIC "STORAGE_DATA_FILE=\"storage.data\"") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_KEY_PRESSED_QUEUE=16") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_DECOMPRESSION_SIZE=64") | |||
| if (${GRAPHICS} MATCHES "GRAPHICS_API_OPENGL_33" OR ${GRAPHICS} MATCHES "GRAPHICS_API_OPENGL_11") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_BATCH_BUFFER_ELEMENTS=8192") | |||
| elseif (${GRAPHICS} MATCHES "GRAPHICS_API_OPENGL_ES2") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_BATCH_BUFFER_ELEMENTS=2048") | |||
| endif () | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_BATCH_DRAWCALLS=256") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_MATRIX_STACK_SIZE=32") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_SHADER_LOCATIONS=32") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_MATERIAL_MAPS=12") | |||
| target_compile_definitions("raylib" PUBLIC "RL_CULL_DISTANCE_NEAR=0.01") | |||
| target_compile_definitions("raylib" PUBLIC "RL_CULL_DISTANCE_FAR=1000.0") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_SHADER_ATTRIB_NAME_POSITION=\"vertexPosition\"") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD=\"vertexTexCoord\"") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_SHADER_ATTRIB_NAME_NORMAL=\"vertexNormal\"") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_SHADER_ATTRIB_NAME_COLOR=\"vertexColor\"") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_SHADER_ATTRIB_NAME_TANGENT=\"vertexTangent\"") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2=\"vertexTexCoord2\"") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_TEXT_BUFFER_LENGTH=1024") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_TEXT_UNICODE_CHARS=512") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_TEXTSPLIT_COUNT=128") | |||
| target_compile_definitions("raylib" PUBLIC "AUDIO_DEVICE_FORMAT=ma_format_f32") | |||
| target_compile_definitions("raylib" PUBLIC "AUDIO_DEVICE_CHANNELS=2") | |||
| target_compile_definitions("raylib" PUBLIC "AUDIO_DEVICE_SAMPLE_RATE=44100") | |||
| target_compile_definitions("raylib" PUBLIC "DEFAULT_AUDIO_BUFFER_SIZE=4096") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_TRACELOG_MSG_LENGTH=128") | |||
| target_compile_definitions("raylib" PUBLIC "MAX_UWP_MESSAGES=512") | |||
| endif () | |||
+ 0
- 5
cmake/LibraryConfigurations.cmake
View File
+ 1
- 6
src/CMakeLists.txt
View File
+ 0
- 9
src/config.h
View File
+ 0
- 91
src/config.h.in
View File
| @ -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 | |||