From 44225e4c284317ed296ac3d94bd50dc17a62b0dc Mon Sep 17 00:00:00 2001 From: James Benton Date: Mon, 4 Jan 2016 05:20:12 -0800 Subject: [PATCH] Fix LIBRARY_NAME --- include/gx2_init.h | 3 +++ rpl/libcoreinit/config.h | 3 +-- rpl/libgx2/config.h | 3 +-- rpl/libgx2/exports.h | 3 ++- samples/helloworld/src/main.c | 1 - 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/gx2_init.h b/include/gx2_init.h index 0c66194..3caa9f9 100644 --- a/include/gx2_init.h +++ b/include/gx2_init.h @@ -7,6 +7,9 @@ extern "C" { void GX2Init(); +void +GX2Shutdown(); + #ifdef __cplusplus } #endif diff --git a/rpl/libcoreinit/config.h b/rpl/libcoreinit/config.h index 009754b..d4cc3bd 100644 --- a/rpl/libcoreinit/config.h +++ b/rpl/libcoreinit/config.h @@ -1,2 +1 @@ -#define LIBRARY_NAME "coreinit.rpl" -#define LIBRARY_SYMBOL coreinit +#define LIBRARY_NAME "coreinit" diff --git a/rpl/libgx2/config.h b/rpl/libgx2/config.h index 26aad31..9e7fa8d 100644 --- a/rpl/libgx2/config.h +++ b/rpl/libgx2/config.h @@ -1,2 +1 @@ -#define LIBRARY_NAME "gx2.rpl" -#define LIBRARY_SYMBOL gx2 +#define LIBRARY_NAME "gx2" diff --git a/rpl/libgx2/exports.h b/rpl/libgx2/exports.h index e0c195c..a566a03 100644 --- a/rpl/libgx2/exports.h +++ b/rpl/libgx2/exports.h @@ -1 +1,2 @@ -EXPORT(GX2Init); \ No newline at end of file +EXPORT(GX2Init); +EXPORT(GX2Shutdown); \ No newline at end of file diff --git a/samples/helloworld/src/main.c b/samples/helloworld/src/main.c index 064d035..58c893c 100644 --- a/samples/helloworld/src/main.c +++ b/samples/helloworld/src/main.c @@ -3,7 +3,6 @@ int main(int argc, char **argv) { - GX2Init(); OSFatal("my first rpx"); return 0; }