diff options
| author | Ray <[email protected]> | 2018-02-04 12:51:24 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-04 12:51:24 +0100 |
| commit | d50e291e8639de5cfb222bffc431f0f76151d48a (patch) | |
| tree | 9637c6d00738ecc75195bd754bc9bc6daad642d2 /src/models.c | |
| parent | 8380c488be90ed0c29a6446b490bfaca6574436e (diff) | |
| parent | 6dc2f979ccbb4ec6f8166805b5f4f6377efbce70 (diff) | |
| download | raylib-d50e291e8639de5cfb222bffc431f0f76151d48a.tar.gz raylib-d50e291e8639de5cfb222bffc431f0f76151d48a.zip | |
Merge pull request #458 from raysan5/develop
Integrate develop branch into master
Diffstat (limited to 'src/models.c')
| -rw-r--r-- | src/models.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/models.c b/src/models.c index 4b8a6731..1f37e345 100644 --- a/src/models.c +++ b/src/models.c @@ -17,7 +17,7 @@ * * LICENSE: zlib/libpng * -* Copyright (c) 2014-2017 Ramon Santamaria (@raysan5) +* Copyright (c) 2014-2018 Ramon Santamaria (@raysan5) * * This software is provided "as-is", without any express or implied warranty. In no event * will the authors be held liable for any damages arising from the use of this software. @@ -45,9 +45,7 @@ #include "raylib.h" -#if defined(PLATFORM_ANDROID) - #include "utils.h" // Android fopen function map -#endif +#include "utils.h" // Required for: fopen() Android mapping #include <stdio.h> // Required for: FILE, fopen(), fclose(), fscanf(), feof(), rewind(), fgets() #include <stdlib.h> // Required for: malloc(), free() @@ -57,7 +55,7 @@ #include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 #define PAR_SHAPES_IMPLEMENTATION -#include "external/par_shapes.h" +#include "external/par_shapes.h" // Shapes 3d parametric generation //---------------------------------------------------------------------------------- // Defines and Macros |