Added C support

nasa · Jan 14, 2025 · 74c7512 · 74c7512
1 parent 04c0fea
commit 74c7512
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 81 deletions.
diff --git a/bin/trick-ify b/bin/trick-ify
@@ -134,9 +134,16 @@ if ($full_build)
         foreach $src (@src_files)
         {
             $file = $src ;
-            $file =~ s/\Q.cpp\E$// ; 
-            $file =~ s/\Q.c$\E$// ; 
-            $cmd = "g++ $source_make_args -I $trick_home" . "/include -c $src -o $file.o" ;
+            if($file =~ /\S*(\Q.c\E)$/)
+            {
+                $file =~ s/\Q.c\E$// ;
+                $cmd = "gcc $source_make_args -I $trick_home" . "/include -c $src -o $file.o" ;
+            }
+            else
+            {
+                $file =~ s/\Q.cpp\E$// ; 
+                $cmd = "g++ $source_make_args -I $trick_home" . "/include -c $src -o $file.o" ;
+            }
             if($debug)
             {
                 print "Building obj file: $cmd\n" ;

diff --git a/test/SIM_trickified_archive/S_define b/test/SIM_trickified_archive/S_define
@@ -1,14 +1,13 @@
 #include "sim_objects/default_trick_sys.sm"
 ##include "Foo.hh"
-##include "Bar.hh"
+##include "Bar.h"
 ##include "Baz.hh"
 
 class Sandbox : public Trick::SimObject {
 
     public:
 
     Foo foo;
-    Bar bar;
     Baz baz;
 
     Sandbox() {

diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.c b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.c
@@ -0,0 +1,6 @@
+#include "Bar.h"
+
+int  process(long long x) {return 0;}
+void add() {}
+void remove_Bar() {}
+void restart() {}
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.cpp
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.h b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.h
@@ -0,0 +1,16 @@
+// @trick_parse{everything}
+
+#include "trick/exec_proto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void add();
+void remove_Bar();
+void restart();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/SIM_trickified_archive/trickified_project/include_bar/Bar.hh b/test/SIM_trickified_archive/trickified_project/include_bar/Bar.hh
diff --git a/test/SIM_trickified_object/S_define b/test/SIM_trickified_object/S_define
@@ -1,14 +1,13 @@
 #include "sim_objects/default_trick_sys.sm"
 ##include "Foo.hh"
-##include "Bar.hh"
+##include "Bar.h"
 ##include "Baz.hh"
 
 class Sandbox : public Trick::SimObject {
 
     public:
 
     Foo foo;
-    Bar bar;
     Baz baz;
 
     Sandbox() {

diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.c b/test/SIM_trickified_object/trickified_project/include_bar/Bar.c
@@ -0,0 +1,6 @@
+#include "Bar.h"
+
+int  process(long long x) {return 0;}
+void add() {}
+void remove_Bar() {}
+void restart() {}
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_object/trickified_project/include_bar/Bar.cpp
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.h b/test/SIM_trickified_object/trickified_project/include_bar/Bar.h
@@ -0,0 +1,16 @@
+// @trick_parse{everything}
+
+#include "trick/exec_proto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void add();
+void remove_Bar();
+void restart();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/SIM_trickified_object/trickified_project/include_bar/Bar.hh b/test/SIM_trickified_object/trickified_project/include_bar/Bar.hh
diff --git a/test/SIM_trickified_shared/S_define b/test/SIM_trickified_shared/S_define
@@ -1,14 +1,13 @@
 #include "sim_objects/default_trick_sys.sm"
 ##include "Foo.hh"
-##include "Bar.hh"
+##include "Bar.h"
 ##include "Baz.hh"
 
 class Sandbox : public Trick::SimObject {
 
     public:
 
     Foo foo;
-    Bar bar;
     Baz baz;
 
     Sandbox() {

diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.c b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.c
@@ -0,0 +1,6 @@
+#include "Bar.h"
+
+int  process(long long x) {return 0;}
+void add() {}
+void remove_Bar() {}
+void restart() {}
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.cpp
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.h b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.h
@@ -0,0 +1,16 @@
+// @trick_parse{everything}
+
+#include "trick/exec_proto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void add();
+void remove_Bar();
+void restart();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/SIM_trickified_shared/trickified_project/include_bar/Bar.hh b/test/SIM_trickified_shared/trickified_project/include_bar/Bar.hh