From bea9ef392764f1912fb1e44bb38d6d8fb6a82588 Mon Sep 17 00:00:00 2001 From: unknown <> Date: Fri, 15 Mar 2024 17:54:56 -0400 Subject: [PATCH] Move source files --- src/main/c/compile.sh | 4 ++-- src/main/c/{ => src}/chunkmask.c | 4 ++-- src/main/c/{ => src}/densitystep.c | 4 ++-- src/main/c/{ => src}/fluidsim.c | 10 +++++----- src/main/c/{ => src}/javainterface.c | 10 +++++----- src/main/c/{ => src}/velocitystep.c | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) rename src/main/c/{ => src}/chunkmask.c (93%) rename src/main/c/{ => src}/densitystep.c (99%) rename src/main/c/{ => src}/fluidsim.c (99%) rename src/main/c/{ => src}/javainterface.c (97%) rename src/main/c/{ => src}/velocitystep.c (99%) diff --git a/src/main/c/compile.sh b/src/main/c/compile.sh index dd40d53..608216b 100644 --- a/src/main/c/compile.sh +++ b/src/main/c/compile.sh @@ -52,12 +52,12 @@ rm -f ./*.dll # gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow" -INPUT_FILES="./javainterface.c" +INPUT_FILES="./src/javainterface.c" OUTPUT_FILE="./javainterface.o" gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow" -INPUT_FILES="./fluidsim.c" +INPUT_FILES="./src/fluidsim.c" OUTPUT_FILE="./fluidsim.o" gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE diff --git a/src/main/c/chunkmask.c b/src/main/c/src/chunkmask.c similarity index 93% rename from src/main/c/chunkmask.c rename to src/main/c/src/chunkmask.c index 4777300..0b2d077 100644 --- a/src/main/c/chunkmask.c +++ b/src/main/c/src/chunkmask.c @@ -1,6 +1,6 @@ #include -#include "includes/utilities.h" -#include "includes/chunkmask.h" +#include "../includes/utilities.h" +#include "../includes/chunkmask.h" const uint32_t CHUNK_INDEX_ARR[] = { CHUNK_000, CHUNK_100, CHUNK_200, diff --git a/src/main/c/densitystep.c b/src/main/c/src/densitystep.c similarity index 99% rename from src/main/c/densitystep.c rename to src/main/c/src/densitystep.c index 92403fa..0f522de 100644 --- a/src/main/c/densitystep.c +++ b/src/main/c/src/densitystep.c @@ -2,8 +2,8 @@ #include #include -#include "includes/utilities.h" -#include "includes/chunkmask.h" +#include "../includes/utilities.h" +#include "../includes/chunkmask.h" /** diff --git a/src/main/c/fluidsim.c b/src/main/c/src/fluidsim.c similarity index 99% rename from src/main/c/fluidsim.c rename to src/main/c/src/fluidsim.c index 596963d..133d191 100644 --- a/src/main/c/fluidsim.c +++ b/src/main/c/src/fluidsim.c @@ -1,9 +1,9 @@ #include -#include "includes/utilities.h" -#include "includes/chunkmask.h" -#include "includes/electrosphere_FluidSim.h" -#include "includes/mainFunctions.h" -#include "includes/chunk.h" +#include "../includes/utilities.h" +#include "../includes/chunkmask.h" +#include "../includes/electrosphere_FluidSim.h" +#include "../includes/mainFunctions.h" +#include "../includes/chunk.h" #include "./chunkmask.c" #include "./velocitystep.c" diff --git a/src/main/c/javainterface.c b/src/main/c/src/javainterface.c similarity index 97% rename from src/main/c/javainterface.c rename to src/main/c/src/javainterface.c index 3fc2040..a59dea9 100644 --- a/src/main/c/javainterface.c +++ b/src/main/c/src/javainterface.c @@ -3,13 +3,13 @@ //library includes //include stb ds #define STB_DS_IMPLEMENTATION -#include "./lib/stb/stb_ds.h" +#include "../lib/stb/stb_ds.h" //local includes -#include "./includes/chunk.h" -#include "./includes/chunkmask.h" -#include "./includes/mainFunctions.h" -#include "./includes/utilities.h" +#include "../includes/chunk.h" +#include "../includes/chunkmask.h" +#include "../includes/mainFunctions.h" +#include "../includes/utilities.h" //defines diff --git a/src/main/c/velocitystep.c b/src/main/c/src/velocitystep.c similarity index 99% rename from src/main/c/velocitystep.c rename to src/main/c/src/velocitystep.c index 695831f..1c1ee55 100644 --- a/src/main/c/velocitystep.c +++ b/src/main/c/src/velocitystep.c @@ -2,8 +2,8 @@ #include #include -#include "includes/utilities.h" -#include "includes/chunkmask.h" +#include "../includes/utilities.h" +#include "../includes/chunkmask.h" #define BOUND_NO_DIR 0