From b8735425261fdf4c0310339c4b550a7f1216d636 Mon Sep 17 00:00:00 2001 From: Renato Rotenberg Date: Mon, 6 Feb 2023 21:47:13 -0300 Subject: [PATCH] Add infamous `#ifdef __cplusplus` idiom --- src/libsm64.h | 16 ++++++++++++---- test/main.cpp | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/libsm64.h b/src/libsm64.h index 01ac9ad..d4aa52c 100644 --- a/src/libsm64.h +++ b/src/libsm64.h @@ -15,6 +15,10 @@ #define SM64_LIB_FN #endif +#ifdef __cplusplus +extern "C" { +#endif + struct SM64Surface { int16_t type; @@ -105,16 +109,16 @@ struct SM64SurfaceCollisionData int8_t room; int32_t lowerY; // libsm64: 32 bit int32_t upperY; // libsm64: 32 bit - int32_t vertex1[3]; // libsm64: 32 bit - int32_t vertex2[3]; // libsm64: 32 bit - int32_t vertex3[3]; // libsm64: 32 bit + int32_t vertex1[3]; // libsm64: 32 bit + int32_t vertex2[3]; // libsm64: 32 bit + int32_t vertex3[3]; // libsm64: 32 bit struct { float x; float y; float z; } normal; float originOffset; - + uint8_t isValid; // libsm64: added field struct SM64SurfaceObjectTransform *transform; // libsm64: added field uint16_t terrain; // libsm64: added field @@ -186,4 +190,8 @@ extern SM64_LIB_FN void sm64_play_sound(int32_t soundBits, float *pos); extern SM64_LIB_FN void sm64_play_sound_global(int32_t soundBits); extern SM64_LIB_FN void sm64_set_sound_volume(float vol); +#ifdef __cplusplus +} +#endif + #endif//LIB_SM64_H diff --git a/test/main.cpp b/test/main.cpp index 79a4b4d..220c031 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -9,8 +9,9 @@ #include #include -extern "C" { #include "../src/libsm64.h" + +extern "C" { #define SDL_MAIN_HANDLED #include "level.h" #include "context.h"