isundil 10 лет назад
Родитель
Сommit
798ea6c3ce
4 измененных файлов с 31 добавлено и 8 удалено
  1. 11 6
      CMakeLists.txt
  2. 9 0
      lib/sllist/include/sllist.h
  3. 11 0
      lib/sllist/src/create.c
  4. 0 2
      src/CMakeLists.txt

+ 11 - 6
CMakeLists.txt

@@ -1,13 +1,18 @@
 cmake_minimum_required(VERSION 2.8)
-project(sandbox)
 
-include_directories(src)
+add_library(sllist STATIC lib/sllist/src/create.c)
+add_executable(sandbox src/main.c src/mem.c src/exec.c src/param.c src/sandbox.c src/environment.c
+	src/ovr_syscall/ovr_write.c src/ovr_syscall/ovr_open.c src/ovr_syscall/ovr_close.c)
+
+set_property(TARGET sandbox PROPERTY RUNTIME_OUTPUT_DIRECTORY bin)
+set_property(TARGET sllist  PROPERTY LIBRARY_OUTPUT_DIRECTORY lib)
+set_property(TARGET sllist  PROPERTY ARCHIVE_OUTPUT_DIRECTORY lib)
 
-SET(EXECUTABLE_OUTPUT_PATH ../bin)
 add_definitions ("-Wall")
 add_definitions ("-g3")
 
-add_subdirectory(src)
+include_directories(src lib/sllist/include)
+target_link_libraries(sandbox sllist)
 
-add_subdirectory(test/open)
-add_subdirectory(test/test)
+#add_subdirectory(test/open)
+#add_subdirectory(test/test)

+ 9 - 0
lib/sllist/include/sllist.h

@@ -0,0 +1,9 @@
+#ifndef   SL_LIST_H__
+# define  SL_LIST_H__
+
+typedef struct {
+} sl_list;
+
+sl_list *sllist_create();
+
+#endif /* SL_LIST_H__ */

+ 11 - 0
lib/sllist/src/create.c

@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include "sllist.h"
+
+sl_list *sllist_create()
+{
+	sl_list *result;
+
+	result = malloc(sizeof(*result));
+	return result;
+}
+

+ 0 - 2
src/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_executable(sandbox main.c mem.c exec.c param.c sandbox.c environment.c
-	ovr_syscall/ovr_write.c ovr_syscall/ovr_open.c ovr_syscall/ovr_close.c)