mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-06 20:44:25 +00:00
Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)
To expand with full Organic Maps and Maps.ME commits history run: git remote add om-historic [om-historic.git repo url] git fetch --tags om-historic git replace squashed-history historic-commits
This commit is contained in:
22
std/boost_container_hash.hpp
Normal file
22
std/boost_container_hash.hpp
Normal file
@@ -0,0 +1,22 @@
|
||||
#pragma once
|
||||
|
||||
// Surprisingly, clang defines __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#endif // defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER)
|
||||
|
||||
// #if defined(__clang__)
|
||||
// #pragma clang diagnostic push
|
||||
// #pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||
// #endif // defined(__clang__)
|
||||
|
||||
#include <boost/container_hash/hash.hpp>
|
||||
|
||||
// #if defined(__clang__)
|
||||
// #pragma clang diagnostic pop
|
||||
// #endif // defined(__clang__)
|
||||
|
||||
#if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif // defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER)
|
||||
3
std/boost_geometry.hpp
Normal file
3
std/boost_geometry.hpp
Normal file
@@ -0,0 +1,3 @@
|
||||
#pragma once
|
||||
|
||||
#include <boost/geometry.hpp>
|
||||
17
std/glm_gtx_rotate_vector.hpp
Normal file
17
std/glm_gtx_rotate_vector.hpp
Normal file
@@ -0,0 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdeprecated-volatile"
|
||||
#elif defined(__GNUC__) || defined(__GNUG__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wvolatile"
|
||||
#endif
|
||||
|
||||
#include <glm/gtx/rotate_vector.hpp>
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#elif defined(__GNUC__) || defined(__GNUG__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
41
std/target_os.hpp
Normal file
41
std/target_os.hpp
Normal file
@@ -0,0 +1,41 @@
|
||||
#pragma once
|
||||
|
||||
#if defined(ANDROID) || defined(__ANDROID__)
|
||||
#define OMIM_OS_ANDROID
|
||||
#define OMIM_OS_NAME "android"
|
||||
#define OMIM_OS_MOBILE
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
#include <TargetConditionals.h>
|
||||
#if (TARGET_OS_IPHONE > 0)
|
||||
#define OMIM_OS_IPHONE
|
||||
#define OMIM_OS_NAME "ios"
|
||||
#if (TARGET_IPHONE_SIMULATOR > 0)
|
||||
#define OMIM_OS_IPHONE_SIMULATOR
|
||||
#else
|
||||
#define OMIM_OS_IPHONE_DEVICE
|
||||
#endif
|
||||
#define OMIM_OS_MOBILE
|
||||
|
||||
#else
|
||||
#define OMIM_OS_MAC
|
||||
#define OMIM_OS_NAME "mac"
|
||||
#define OMIM_OS_DESKTOP
|
||||
#endif
|
||||
|
||||
#elif defined(_WIN32)
|
||||
#define OMIM_OS_WINDOWS
|
||||
#define OMIM_OS_NAME "win"
|
||||
#define OMIM_OS_DESKTOP
|
||||
|
||||
#ifdef __MINGW32__
|
||||
#define OMIM_OS_WINDOWS_MINGW
|
||||
#else
|
||||
#define OMIM_OS_WINDOWS_NATIVE
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define OMIM_OS_LINUX
|
||||
#define OMIM_OS_NAME "linux"
|
||||
#define OMIM_OS_DESKTOP
|
||||
#endif
|
||||
13
std/windows.hpp
Normal file
13
std/windows.hpp
Normal file
@@ -0,0 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
#include "target_os.hpp"
|
||||
|
||||
#ifdef OMIM_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
|
||||
#undef min
|
||||
#undef max
|
||||
//#undef far
|
||||
//#undef near
|
||||
|
||||
#endif // OMIM_OS_WINDOWS
|
||||
Reference in New Issue
Block a user