From 293aef9dbfe4fe925c3bef57b5d5157cf576833c Mon Sep 17 00:00:00 2001 From: GuilhermeWerner <26710260+GuilhermeWerner@users.noreply.github.com> Date: Sun, 18 Apr 2021 20:02:28 -0300 Subject: [PATCH] Update Crate and Examples --- Examples/C/Hello.c | 19 -------------- Examples/C/Main.c | 14 +++++++++++ Examples/CSharp/{Program.cs => Main.cs} | 2 +- Examples/Cpp/{Hello.cpp => Main.cpp} | 5 ---- Source/Library.h | 33 +++++++++++++++++++++++++ Source/Library.rs | 2 -- 6 files changed, 48 insertions(+), 27 deletions(-) delete mode 100644 Examples/C/Hello.c create mode 100644 Examples/C/Main.c rename Examples/CSharp/{Program.cs => Main.cs} (97%) rename Examples/Cpp/{Hello.cpp => Main.cpp} (67%) create mode 100644 Source/Library.h diff --git a/Examples/C/Hello.c b/Examples/C/Hello.c deleted file mode 100644 index 5404c20..0000000 --- a/Examples/C/Hello.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "stdio.h" - -#include "Library.h" - -extern float Add(float Num1, float Num2); -extern float Divide(float Num1, float Num2); -extern float Multiply(float Num1, float Num2); -extern float Subtract(float Num1, float Num2); - -int main() -{ - int num1 = 1; - int num2 = 2; - - printf("Added: %f\n", Add(num1, num2)); - printf("Subtracted: %f\n", Subtract(num1, num2)); - printf("Multiplied: %f\n", Multiply(num1, num2)); - printf("Divided: %f\n", Divide(num1, num2)); -} diff --git a/Examples/C/Main.c b/Examples/C/Main.c new file mode 100644 index 0000000..2e0fffa --- /dev/null +++ b/Examples/C/Main.c @@ -0,0 +1,14 @@ +#include "stdio.h" + +#include "Library.h" + +int main() +{ + int num1 = 1; + int num2 = 2; + + printf("Added: %g\n", Add(num1, num2)); + printf("Subtracted: %g\n", Subtract(num1, num2)); + printf("Multiplied: %g\n", Multiply(num1, num2)); + printf("Divided: %g\n", Divide(num1, num2)); +} diff --git a/Examples/CSharp/Program.cs b/Examples/CSharp/Main.cs similarity index 97% rename from Examples/CSharp/Program.cs rename to Examples/CSharp/Main.cs index 96488ec..e420892 100644 --- a/Examples/CSharp/Program.cs +++ b/Examples/CSharp/Main.cs @@ -5,7 +5,7 @@ namespace CSharp { class Program { - #if WINDOWS_PLATFORM + #if PLATFORM_WINDOWS const string Library = "Library"; #else const string Library = "libLibrary"; diff --git a/Examples/Cpp/Hello.cpp b/Examples/Cpp/Main.cpp similarity index 67% rename from Examples/Cpp/Hello.cpp rename to Examples/Cpp/Main.cpp index 5bd71fd..44ebdc7 100644 --- a/Examples/Cpp/Hello.cpp +++ b/Examples/Cpp/Main.cpp @@ -4,11 +4,6 @@ using namespace std; -extern float Add(float Num1, float Num2); -extern float Divide(float Num1, float Num2); -extern float Multiply(float Num1, float Num2); -extern float Subtract(float Num1, float Num2); - int main() { int num1 = 1; diff --git a/Source/Library.h b/Source/Library.h new file mode 100644 index 0000000..83ad312 --- /dev/null +++ b/Source/Library.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include +#include +#include +#include + +#ifdef __cplusplus +namespace Library +{ +#endif + +#ifdef __cplusplus + extern "C" + { +#endif + + float Add(float num1, float num2); + + float Divide(float num1, float num2); + + float Multiply(float num1, float num2); + + float Subtract(float num1, float num2); + +#ifdef __cplusplus + } +#endif + +#ifdef __cplusplus +} +#endif diff --git a/Source/Library.rs b/Source/Library.rs index 0256e09..268e9b3 100644 --- a/Source/Library.rs +++ b/Source/Library.rs @@ -1,5 +1,3 @@ -#![allow(dead_code)] -#![allow(unused_variables)] #![allow(non_snake_case)] #[no_mangle]