mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-06 17:28:36 +01:00
add the C library headers MSVC needs
Unqualified uint8_t/size_t and friends were reaching 24 units through some other header on libstdc++; MSVC's STL does not do that, which broke gl/ubo.cppm (and made its UBS_PAD macro look like garbage). Also silences C5244, MSVC's counterpart to the clang warning about glm being included in the module purview, which is deliberate here.
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <random>
|
#include <random>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#ifdef __unix__
|
#ifdef __unix__
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "glad/glad.h"
|
#include "glad/glad.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include "glad/glad.h"
|
#include "glad/glad.h"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include "glad/glad.h"
|
#include "glad/glad.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <zmq_addon.hpp>
|
#include <zmq_addon.hpp>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ obtain one at
|
|||||||
http://mozilla.org/MPL/2.0/.
|
http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "utilities/Globals_macros.h"
|
#include "utilities/Globals_macros.h"
|
||||||
#include <png.h>
|
#include <png.h>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <istream>
|
#include <istream>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/.
|
|||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <istream>
|
#include <istream>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ obtain one at
|
|||||||
http://mozilla.org/MPL/2.0/.
|
http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include "utilities/Globals_macros.h"
|
#include "utilities/Globals_macros.h"
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ export module eu07.glm;
|
|||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
|
#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable : 5244)
|
||||||
|
#endif
|
||||||
export {
|
export {
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
#include <glm/fwd.hpp>
|
#include <glm/fwd.hpp>
|
||||||
@@ -71,6 +75,9 @@ export {
|
|||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
export {
|
export {
|
||||||
// 12-byte vec3 that stays packed regardless of GLM_FORCE_DEFAULT_ALIGNED_GENTYPES.
|
// 12-byte vec3 that stays packed regardless of GLM_FORCE_DEFAULT_ALIGNED_GENTYPES.
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "utilities/Globals_macros.h"
|
#include "utilities/Globals_macros.h"
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <condition_variable>
|
#include <condition_variable>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
module;
|
module;
|
||||||
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <condition_variable>
|
#include <condition_variable>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include "utilities/translation_macros.h"
|
#include "utilities/translation_macros.h"
|
||||||
#include "glad/glad.h"
|
#include "glad/glad.h"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module;
|
module;
|
||||||
|
#include <cstddef>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
Reference in New Issue
Block a user