Move module sources to src/modules

2019-01-13 15:28:42 +01:00 · 2019-01-13 15:28:42 +01:00 · b71e06fca8
parent 2d4834b735
commit b71e06fca8
22 changed files with 6 additions and 6 deletions
--- a/modules/.lock
+++ b/modules/.lock
--- a/src/Makefile
+++ b/src/Makefile
@ -556,20 +556,20 @@ endif

 MODULE_DEPEND := src/bitops.c src/convert.c src/memory.c src/shared.c src/cpu_aes.c

-MODULES_SRC   := $(wildcard modules/*.c)
-MODULES_LIB   := $(patsubst %.c, %.so, $(MODULES_SRC))
+MODULES_SRC   := $(wildcard src/modules/*.c)
+MODULES_LIB   := $(patsubst src/modules/%.c, modules/%.so, $(MODULES_SRC))

-modules/module_%.so: modules/module_%.c
+modules/module_%.so: src/modules/module_%.c
 	$(CC)    $(CFLAGS_NATIVE) $< -o $@ -shared -fPIC $(MODULE_DEPEND) -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION)

 modules: $(MODULES_LIB)



-MODULES_LIB_WIN64   := $(patsubst %.c, %.dll, $(MODULES_SRC))
+MODULES_LIB_WIN64   := $(patsubst src/modules/%.c, modules/%.dll, $(MODULES_SRC))

-modules/module_%.dll: modules/module_%.c
-	$(CC_WIN_64)    $(CFLAGS_CROSS_WIN64) $< -o $@ -shared -fPIC $(MODULE_DEPEND)
+modules/module_%.dll: src/modules/module_%.c
+	$(CC_WIN_64)    $(CFLAGS_CROSS_WIN64) $< -o $@ -shared -fPIC $(MODULE_DEPEND) -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION)

 modules_win64: $(MODULES_LIB_WIN64)

--- a/src/modules/module_00000.c
+++ b/src/modules/module_00000.c
--- a/src/modules/module_00010.c
+++ b/src/modules/module_00010.c
--- a/src/modules/module_00011.c
+++ b/src/modules/module_00011.c
--- a/src/modules/module_00100.c
+++ b/src/modules/module_00100.c
--- a/src/modules/module_00101.c
+++ b/src/modules/module_00101.c
--- a/src/modules/module_00110.c
+++ b/src/modules/module_00110.c
--- a/src/modules/module_00200.c
+++ b/src/modules/module_00200.c
--- a/src/modules/module_00300.c
+++ b/src/modules/module_00300.c
--- a/src/modules/module_00400.c
+++ b/src/modules/module_00400.c
--- a/src/modules/module_00500.c
+++ b/src/modules/module_00500.c
--- a/src/modules/module_00501.c
+++ b/src/modules/module_00501.c
--- a/src/modules/module_00900.c
+++ b/src/modules/module_00900.c
--- a/src/modules/module_01000.c
+++ b/src/modules/module_01000.c
--- a/src/modules/module_01300.c
+++ b/src/modules/module_01300.c
--- a/src/modules/module_01400.c
+++ b/src/modules/module_01400.c
--- a/src/modules/module_01600.c
+++ b/src/modules/module_01600.c
--- a/src/modules/module_01700.c
+++ b/src/modules/module_01700.c
--- a/src/modules/module_02400.c
+++ b/src/modules/module_02400.c
--- a/src/modules/module_06300.c
+++ b/src/modules/module_06300.c
--- a/src/modules/module_10800.c
+++ b/src/modules/module_10800.c