git-svn-id: svn://db.shs.com.ru/pip@556 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

CMakeLists.txt

@@ -28,11 +28,12 @@ macro(gather_src DIR CPP H H_P)
 	list(APPEND ${H_P} ${PHS})
 endmacro()
 
-set(PIP_SRC_MAIN  "src_main")
-set(PIP_SRC_CRYPT "src_crypt")
+set(PIP_SRC_MAIN     "src_main")
+set(PIP_SRC_CRYPT    "src_crypt")
 set(PIP_SRC_COMPRESS "src_compress")
-set(PIP_SRC_USB   "src_usb")
-set(PIP_SRC_FFTW  "src_fftw")
+set(PIP_SRC_USB      "src_usb")
+set(PIP_SRC_FFTW     "src_fftw")
+#set(PIP_SRC_RESOURCES  "src_resources")
 set(PIP_LIBS_TARGETS pip)
 set(LIBS_MAIN)
 set(LIBS_STATUS)
@@ -85,7 +86,7 @@ endif()
 # Sources
 
 # Main lib
-set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo")
+set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo" "resources")
 include_directories("${PIP_SRC_MAIN}")
 foreach(F ${PIP_FOLDERS})
 	include_directories("${PIP_SRC_MAIN}/${F}")
@@ -104,6 +105,9 @@ gather_src("${PIP_SRC_USB}" CPP_LIB_USB HDRS PHDRS)
 # FFTW lib
 gather_src("${PIP_SRC_FFTW}" CPP_LIB_FFTW HDRS PHDRS)
 
+# Resources lib
+#gather_src("${PIP_SRC_RESOURCES}" CPP_LIB_RESOURCES HDRS PHDRS)
+
 
 # Check Bessel functions
 set(CMAKE_REQUIRED_INCLUDES math.h)
@@ -357,8 +361,14 @@ else()
 endif()
 
 
+# Add resource system
+#add_library(pip_resources SHARED ${CPP_LIB_RESOURCES})
+#target_link_libraries(pip_resources pip )
+#list(APPEND PIP_LIBS_TARGETS pip_resources)
+
+
 # Test program
-add_executable(pip_test "main.cpp")
+add_executable(pip_test "main.cpp" "1.cpp")
 target_link_libraries(pip_test pip pip_compress)
 
 
@@ -407,6 +417,7 @@ add_subdirectory("${PIP_SRC_MAIN}/auxiliary/piterminal")
 add_subdirectory("utils/system_test")
 add_subdirectory("utils/remote_console")
 add_subdirectory("utils/code_model_generator")
+add_subdirectory("utils/resources_compiler")
 add_subdirectory("utils/udp_file_transfer")
 if(sodium_FOUND)
 	add_subdirectory("utils/system_daemon")