From 7e9040d9cef4660b5eda5f366b89582caf7bdf52 Mon Sep 17 00:00:00 2001
From: jyelon <jyelon@gmail.com>
Date: Mon, 30 Sep 2024 18:15:27 -0400
Subject: [PATCH] Working on merging luprex and integration into one repository

---
 .gitignore                               |  3 ---
 Source/Integration/lpx-basebuffer.hpp    |  1 +
 Source/Integration/lpx-drvutil.cpp       |  1 +
 Source/Integration/lpx-drvutil.hpp       |  1 +
 Source/Integration/lpx-enginewrapper.hpp |  1 +
 Source/Integration/lpx-paths.hpp         |  2 ++
 luprex-install.sh                        | 27 ------------------------
 rebuild-config.sh                        | 19 +++++++++++++++++
 8 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 Source/Integration/lpx-basebuffer.hpp
 create mode 100644 Source/Integration/lpx-drvutil.cpp
 create mode 100644 Source/Integration/lpx-drvutil.hpp
 create mode 100644 Source/Integration/lpx-enginewrapper.hpp
 create mode 100644 Source/Integration/lpx-paths.hpp
 delete mode 100755 luprex-install.sh
 create mode 100755 rebuild-config.sh

diff --git a/.gitignore b/.gitignore
index 940d0336..0306816a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,6 @@ gmon.out
 Integration.code-workspace
 Makefile
 
-Source/Integration/lpx-*.hpp
-Source/Integration/lpx-*.cpp
-
 .vscode/**
 Saved/**
 Platforms/**
diff --git a/Source/Integration/lpx-basebuffer.hpp b/Source/Integration/lpx-basebuffer.hpp
new file mode 100644
index 00000000..db28f011
--- /dev/null
+++ b/Source/Integration/lpx-basebuffer.hpp
@@ -0,0 +1 @@
+#include "../../luprex/ext/base-buffer.hpp"
diff --git a/Source/Integration/lpx-drvutil.cpp b/Source/Integration/lpx-drvutil.cpp
new file mode 100644
index 00000000..162a763e
--- /dev/null
+++ b/Source/Integration/lpx-drvutil.cpp
@@ -0,0 +1 @@
+#include "../../luprex/cpp/drv/drvutil.cpp"
diff --git a/Source/Integration/lpx-drvutil.hpp b/Source/Integration/lpx-drvutil.hpp
new file mode 100644
index 00000000..ffe7ae38
--- /dev/null
+++ b/Source/Integration/lpx-drvutil.hpp
@@ -0,0 +1 @@
+#include "../../luprex/cpp/drv/drvutil.hpp"
diff --git a/Source/Integration/lpx-enginewrapper.hpp b/Source/Integration/lpx-enginewrapper.hpp
new file mode 100644
index 00000000..8327d444
--- /dev/null
+++ b/Source/Integration/lpx-enginewrapper.hpp
@@ -0,0 +1 @@
+#include "../../luprex/cpp/core/enginewrapper.hpp"
diff --git a/Source/Integration/lpx-paths.hpp b/Source/Integration/lpx-paths.hpp
new file mode 100644
index 00000000..3cc57b9f
--- /dev/null
+++ b/Source/Integration/lpx-paths.hpp
@@ -0,0 +1,2 @@
+#define LUPREX_DLL_PATH "/home/jyelon/integration/luprex/build/linux/luprexlib.so"
+#define LUPREX_ROOT_PATH "/home/jyelon/integration/luprex"
diff --git a/luprex-install.sh b/luprex-install.sh
deleted file mode 100755
index ca7a9832..00000000
--- a/luprex-install.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-#
-# Install symbolic links to the Luprex source and the Luprex DLL.
-#
-# These symbolic links are needed to be able to build integration.
-#
-#
-
-if [ -d c:/luprex ] ; then
-	LUPREX=c:/luprex
-	DLL=$LUPREX/build/visual/luprexlib.dll
-else
-	LUPREX=$HOME/luprex
-	DLL=$LUPREX/build/linux/luprexlib.so
-fi
-
-rm -f Source/Integration/lpx-*.hpp
-rm -f Source/Integration/lpx-*.cpp
-
-echo '#include "'$LUPREX'/ext/base-buffer.hpp"'         > Source/Integration/lpx-basebuffer.hpp
-echo '#include "'$LUPREX'/cpp/drv/drvutil.hpp"'         > Source/Integration/lpx-drvutil.hpp
-echo '#include "'$LUPREX'/cpp/drv/drvutil.cpp"'         > Source/Integration/lpx-drvutil.cpp
-echo '#include "'$LUPREX'/cpp/core/enginewrapper.hpp"'  > Source/Integration/lpx-enginewrapper.hpp
-echo '#define LUPREX_DLL_PATH "'$DLL'"'                 > Source/Integration/lpx-paths.hpp
-echo '#define LUPREX_ROOT_PATH "'$LUPREX'"'             >> Source/Integration/lpx-paths.hpp
-
diff --git a/rebuild-config.sh b/rebuild-config.sh
new file mode 100755
index 00000000..3e67a47d
--- /dev/null
+++ b/rebuild-config.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+
+#
+# Fix the file 'lpx-paths.hpp', which contains the paths for the luprex
+# DLL and the luprex root path.
+#
+
+if [ -d c:/luprex ] ; then
+	LUPREX=c:/integration/luprex
+	DLL=$LUPREX/build/visual/luprexlib.dll
+else
+	LUPREX=$HOME/integration/luprex
+	DLL=$LUPREX/build/linux/luprexlib.so
+fi
+
+echo '#define LUPREX_DLL_PATH "'$DLL'"'                 > Source/Integration/lpx-paths.hpp
+echo '#define LUPREX_ROOT_PATH "'$LUPREX'"'             >> Source/Integration/lpx-paths.hpp
+