From 365a333b1d1e050a1adbe00c03a0375c4a2d0688 Mon Sep 17 00:00:00 2001 From: prez Date: Mon, 11 Apr 2022 17:09:36 +0200 Subject: [PATCH] Fix compilation on musl libc --- ImageShader.h | 3 --- Resource.h | 4 +--- Scene.h | 3 --- Settings.h | 3 --- tinyxml2Toolkit.h | 2 -- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/ImageShader.h b/ImageShader.h index 251d81f..5ceb358 100644 --- a/ImageShader.h +++ b/ImageShader.h @@ -3,10 +3,7 @@ #include #include - -#ifdef __APPLE__ #include -#endif #include "Shader.h" diff --git a/Resource.h b/Resource.h index 1d8463d..68b5574 100644 --- a/Resource.h +++ b/Resource.h @@ -3,9 +3,7 @@ #include #include -#ifdef __APPLE__ #include -#endif namespace Resource { @@ -14,7 +12,7 @@ namespace Resource // return file tyext content as one string 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 uint getTextureDDS(const std::string& path, float *aspect_ratio = nullptr); diff --git a/Scene.h b/Scene.h index ee33b15..19614d1 100644 --- a/Scene.h +++ b/Scene.h @@ -3,10 +3,7 @@ #define INVALID_ID -1 -#ifdef __APPLE__ #include -#endif - #include #include #include diff --git a/Settings.h b/Settings.h index 3eaca67..5174773 100644 --- a/Settings.h +++ b/Settings.h @@ -1,10 +1,7 @@ #ifndef __SETTINGS_H_ #define __SETTINGS_H_ -#ifdef __APPLE__ #include -#endif - #include #include #include diff --git a/tinyxml2Toolkit.h b/tinyxml2Toolkit.h index 67c1766..a5eb699 100644 --- a/tinyxml2Toolkit.h +++ b/tinyxml2Toolkit.h @@ -2,9 +2,7 @@ #define TINYXML2TOOLKIT_H #include -#ifdef __APPLE__ #include -#endif #include