Changes to be committed:

	modified:   .gitignore
	modified:   CMakeLists.txt
	deleted:    Config/Ann-H-Private.cmake.in
	deleted:    Config/Ann-H.cmake.in
	modified:   Config/Ann.cmake.in
	deleted:    Config/CL-Ann-H.cmake.in
	deleted:    Config/CL-Ann.cmake.in
	deleted:    Config/MMap-H.cmake.in
	modified:   Config/MMap.cmake.in
	new file:   Config/VK-Ann.cmake.in
	modified:   src/ann/Mlp.def.cc
	modified:   src/ann/Slp.def.cc
	new file:   src/vk/Slp.def.cc
	new file:   src/vk/Slp.imp.c
	modified:   test.sh
	modified:   test/ann/Conv.c
	modified:   test/ann/MlpTrainXOR-Made-Primal.c
	modified:   test/ann/MlpTrainXOR-Primal.c
	modified:   test/ann/MlpTrainXOR.c
	new file:   test/ann/MlpTrainXOR.c.cc
	renamed:    test/ann/MlpTrainXOR-Primal.cc -> test/ann/MlpTrainXOR.cc

Author: Dalmurii

.gitignore

@@ -25,3 +25,5 @@ inc/ae2f/Ann/Slp.h
 inc/ae2f/Ann/Mlp.h
 inc/ae2f/MMap/MMap.h
 inc/ae2f/MMap/Util.h
+
+inc/ae2fVK/Ann/Slp.h

CMakeLists.txt

@@ -3,8 +3,9 @@ enable_testing()
 option(ae2f_CXX "" ON)
 option(ae2fVK_needed "" OFF)
 option(ae2f_TEST "" ON)
-option(ae2f_MAC_BUILD "" ON)
+option(ae2f_MAC_BUILD "" OFF)
 option(ae2f_IS_SHARED "" OFF)
+option(ae2f_DEVEL ""	OFF)
 
 include(cmake/Core.cmake)
 
@@ -64,6 +65,28 @@ if(NOT TARGET ae2f::Ann)
 	ae2f_CoreTestTent(${ae2f__Ann__TENT} "test/ann")
 endif()
 
-if(ae2fVK_needed)
+if(ae2fVK_needed AND NOT TARGET ae2fVK::Ann)
 	ae2f_CoreLibFetchX(ae2f VK-Core	main)
+	file(GLOB AnnVK-inc ${PROJECT_SOURCE_DIR}/inc/ae2fVK/Ann/*.h)
+
+	if(ae2f_DEVEL)
+		file(GLOB_RECURSE AnnVK-src ${PROJECT_SOURCE_DIR}/src/vk/*.def.c*)
+	else()
+		set(AnnVK-src "")
+	endif()
+
+	ae2f_Macro_Lib_V(
+		ae2fVK VK-Ann "${ae2f_LIBPREFIX}" 
+		${PROJECT_SOURCE_DIR}/src/vk "*.imp.c" 
+		${PROJECT_SOURCE_DIR}/src/vk "*.def.c*" 
+		${PROJECT_SOURCE_DIR}/inc/ae2fVK/Ann ".h"
+		${PROJECT_SOURCE_DIR}/Config/VK-Ann.cmake.in inc
+		${AnnVK-inc} ${AnnVK-src}
+	)
+
+	add_library(ae2fVK::Ann ALIAS ${ae2fVK__VK-Ann__TENT})
+	add_library(ae2f::VK-Ann ALIAS ${ae2fVK__VK-Ann__TENT})
+
+	ae2f_itll(${ae2fVK__VK-Ann__TENT} ae2f::Ann)
+	ae2f_itll(${ae2fVK__VK-Ann__TENT} ae2fVK::Core)
 endif()

Config/Ann-H-Private.cmake.in

@@ -5,8 +5,11 @@ include(CMakeFindDependencyMacro)
 include(CMakePackageConfigHelpers)
 include("${CMAKE_CURRENT_LIST_DIR}/AnnTargets.cmake")
 
-find_dependency(Ann-H REQUIRED)
-link_libraries(ae2f::Ann-H)
+find_dependency(MMap REQUIRED)
+link_libraries(ae2f::MMap)
 
-find_dependency(Ann-H-Private REQUIRED)
-link_libraries(ae2f::Ann-H-Private)
+find_dependency(VK-Core REQUIRED)
+link_libraries(ae2fVK::VK-Core)
+
+find_dependency(Ann REQUIRED)
+link_libraries(ae2f::Ann)

Config/Ann-H.cmake.in

@@ -5,5 +5,8 @@ include(CMakeFindDependencyMacro)
 include(CMakePackageConfigHelpers)
 include("${CMAKE_CURRENT_LIST_DIR}/MMapTargets.cmake")
 
-find_dependency(MMap-H REQUIRED)
-link_libraries(ae2f::MMap-H)
+find_dependency(Core REQUIRED)
+link_libraries(ae2f::Core)
+
+find_dependency(Preproc REQUIRED)
+link_libraries(ae2f::Preproc)

Config/Ann.cmake.in

@@ -0,0 +1,15 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+include(CMakePackageConfigHelpers)
+include("${CMAKE_CURRENT_LIST_DIR}/VK-AnnTargets.cmake")
+
+find_dependency(MMap REQUIRED)
+link_libraries(ae2f::MMap)
+
+find_dependency(VK-Core REQUIRED)
+link_libraries(ae2fVK::VK-Core)
+
+find_dependency(Ann REQUIRED)
+link_libraries(ae2f::Ann)