From 118cf9e0630f565f9468e7ee4ec25e308e94c215 Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Thu, 24 Mar 2022 21:28:27 -0500
Subject: [PATCH] moved onyx_runtime to not be module

---
 build.bat                                    | 6 +++++-
 build.sh                                     | 1 +
 modules/onyx_runtime/build.bat               | 9 ---------
 modules/onyx_runtime/build.sh                | 3 ---
 {modules/onyx_runtime => src}/onyx_runtime.c | 0
 5 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 modules/onyx_runtime/build.bat
 delete mode 100755 modules/onyx_runtime/build.sh
 rename {modules/onyx_runtime => src}/onyx_runtime.c (100%)

diff --git a/build.bat b/build.bat
index e1c266d5..2cc4af06 100644
--- a/build.bat
+++ b/build.bat
@@ -33,4 +33,8 @@ del *.ilk > NUL 2> NUL
 del *.obj > NUL 2> NUL
 del misc\icon_resource.res
 
-call modules\onyx_runtime\build
+cl /MT /std:c17 /TC /I include /I lib/common/include /D_USRDLL /D_WINDLL src\onyx_runtime.c /link /DLL /OUT:onyx_runtime.dll
+
+del onyx_runtime.obj
+del onyx_runtime.lib
+del onyx_runtime.exp
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 7cbc9c0d..80873fd6 100755
--- a/build.sh
+++ b/build.sh
@@ -104,6 +104,7 @@ if [ ! -z "$ENABLE_BUNDLING_WASMER" ]; then
     sudo cp ./bin/onyxrun "$BIN_DIR/onyxrun"
 
     ./modules/onyx_runtime/build.sh
+    $CC -shared -fpic -I include -I lib/common/include src/onyx_runtime.c -o onyx_runtime.so -lpthread
     sudo mv "./onyx_runtime.so" "$CORE_DIR/lib/onyx_runtime.so"
 fi
 
diff --git a/modules/onyx_runtime/build.bat b/modules/onyx_runtime/build.bat
deleted file mode 100644
index e9e919d9..00000000
--- a/modules/onyx_runtime/build.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-call "tools\dev.bat"
-
-cl /MT /std:c17 /TC /I include /I lib/common/include /D_USRDLL /D_WINDLL modules\onyx_runtime\onyx_runtime.c /link /DLL /OUT:onyx_runtime.dll
-
-del onyx_runtime.obj
-del onyx_runtime.lib
-del onyx_runtime.exp
\ No newline at end of file
diff --git a/modules/onyx_runtime/build.sh b/modules/onyx_runtime/build.sh
deleted file mode 100755
index f800c6f5..00000000
--- a/modules/onyx_runtime/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-gcc -shared -fpic -I include -I lib/common/include modules/onyx_runtime/onyx_runtime.c -o onyx_runtime.so -lpthread
\ No newline at end of file
diff --git a/modules/onyx_runtime/onyx_runtime.c b/src/onyx_runtime.c
similarity index 100%
rename from modules/onyx_runtime/onyx_runtime.c
rename to src/onyx_runtime.c
-- 
2.25.1