mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-12 18:59:59 +01:00
Fix compilation on musl libc
This commit is contained in:
@@ -3,10 +3,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "Shader.h"
|
#include "Shader.h"
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Resource
|
namespace Resource
|
||||||
{
|
{
|
||||||
@@ -14,7 +12,7 @@ namespace Resource
|
|||||||
// return file tyext content as one string
|
// return file tyext content as one string
|
||||||
std::string getText(const std::string& path);
|
std::string getText(const std::string& path);
|
||||||
|
|
||||||
// Support DDS files, DXT1, DXT5 and DXT5
|
// Support DDS files, DXT1, DXT5 and DXT5
|
||||||
// Returns the OpenGL generated Texture index
|
// Returns the OpenGL generated Texture index
|
||||||
uint getTextureDDS(const std::string& path, float *aspect_ratio = nullptr);
|
uint getTextureDDS(const std::string& path, float *aspect_ratio = nullptr);
|
||||||
|
|
||||||
|
|||||||
3
Scene.h
3
Scene.h
@@ -3,10 +3,7 @@
|
|||||||
|
|
||||||
#define INVALID_ID -1
|
#define INVALID_ID -1
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
#ifndef __SETTINGS_H_
|
#ifndef __SETTINGS_H_
|
||||||
#define __SETTINGS_H_
|
#define __SETTINGS_H_
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -2,9 +2,7 @@
|
|||||||
#define TINYXML2TOOLKIT_H
|
#define TINYXML2TOOLKIT_H
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user