From 22f3f78ac51f1a4a664ec424e1d1b0415c85620f Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 11 Nov 2012 22:12:51 +0000 Subject: [PATCH] Move d2x-rebirth/libmve/mvelib.c -> d2x-rebirth/libmve/mvelib.cpp --- SConstruct | 2 +- d2x-rebirth/libmve/{mvelib.c => mvelib.cpp} | 0 d2x-rebirth/libmve/mvelib.h | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) rename d2x-rebirth/libmve/{mvelib.c => mvelib.cpp} (100%) diff --git a/SConstruct b/SConstruct index a23e538ff..dc968095c 100644 --- a/SConstruct +++ b/SConstruct @@ -1272,7 +1272,7 @@ class D2XProgram(DXXProgram): 'libmve/decoder8.cpp', 'libmve/decoder16.cpp', 'libmve/mve_audio.cpp', -'libmve/mvelib.c', +'libmve/mvelib.cpp', 'libmve/mveplay.c', 'main/collide.c', 'main/escort.cpp', diff --git a/d2x-rebirth/libmve/mvelib.c b/d2x-rebirth/libmve/mvelib.cpp similarity index 100% rename from d2x-rebirth/libmve/mvelib.c rename to d2x-rebirth/libmve/mvelib.cpp diff --git a/d2x-rebirth/libmve/mvelib.h b/d2x-rebirth/libmve/mvelib.h index 720dd0019..51c6230b1 100644 --- a/d2x-rebirth/libmve/mvelib.h +++ b/d2x-rebirth/libmve/mvelib.h @@ -6,6 +6,10 @@ #include "libmve.h" +#ifdef __cplusplus +extern "C" { +#endif + extern mve_cb_Read mve_read; extern mve_cb_Alloc mve_alloc; extern mve_cb_Free mve_free; @@ -110,4 +114,8 @@ void mve_set_handler_context(MVESTREAM *movie, void *context); */ int mve_play_next_chunk(MVESTREAM *movie); +#ifdef __cplusplus +} +#endif + #endif /* INCLUDED_MVELIB_H */