From 5a9bcf1ecb744d1c3872137e26cae99fcc975521 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Thu, 25 Sep 2014 18:50:19 +0200 Subject: [PATCH] Files moved into src/ and lib/ --- CMakeLists.txt | 24 ++----------------- makefile => lib/reference_tiger/makefile | 0 sboxes.c => lib/reference_tiger/sboxes.c | 0 tiger.c => lib/reference_tiger/tiger.c | 0 src/CMakeLists.txt | 24 +++++++++++++++++++ main.d => src/main.d | 0 sums.d => src/sums.d | 0 tiger.d => src/tiger.d | 0 .../tigersumConfig.d.in | 0 9 files changed, 26 insertions(+), 22 deletions(-) rename makefile => lib/reference_tiger/makefile (100%) rename sboxes.c => lib/reference_tiger/sboxes.c (100%) rename tiger.c => lib/reference_tiger/tiger.c (100%) create mode 100644 src/CMakeLists.txt rename main.d => src/main.d (100%) rename sums.d => src/sums.d (100%) rename tiger.d => src/tiger.d (100%) rename tigersumConfig.d.in => src/tigersumConfig.d.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3896d0f..ed263b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,29 +1,9 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR) -project(tigersum D C) +project(tigersum) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0 -Wall -Wextra") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -Wall -Wdeprecated") set(CMAKE_D_FLAGS_DEBUG "${CMAKE_D_FLAGS_DEBUG} -funittest -g -O0 -Wall -Wdeprecated") set(CMAKE_D_FLAGS_RELEASE "${CMAKE_D_FLAGS_RELEASE} -O3 -Wall -Wdeprecated") -set(DEFAULT_TIGER_VERSION "1") -set(TIGERSUM_MAJOR "0") -set(TIGERSUM_MINOR "1") - -configure_file( - "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.d.in" - "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.d" -) - -include_directories( - . -) -add_definitions("-J${PROJECT_BINARY_DIR}") - -add_executable(${PROJECT_NAME} - sboxes.c - tiger.c - main.d - tiger.d - sums.d -) +add_subdirectory(src) diff --git a/makefile b/lib/reference_tiger/makefile similarity index 100% rename from makefile rename to lib/reference_tiger/makefile diff --git a/sboxes.c b/lib/reference_tiger/sboxes.c similarity index 100% rename from sboxes.c rename to lib/reference_tiger/sboxes.c diff --git a/tiger.c b/lib/reference_tiger/tiger.c similarity index 100% rename from tiger.c rename to lib/reference_tiger/tiger.c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..024add9 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 2.6 FATAL_ERROR) +project(tigersum D C) + +set(DEFAULT_TIGER_VERSION "1") +set(TIGERSUM_MAJOR "0") +set(TIGERSUM_MINOR "1") + +configure_file( + "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.d.in" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.d" +) + +include_directories( + . +) +add_definitions("-J${PROJECT_BINARY_DIR}") + +add_executable(${PROJECT_NAME} + ../lib/reference_tiger/sboxes.c + ../lib/reference_tiger/tiger.c + main.d + tiger.d + sums.d +) diff --git a/main.d b/src/main.d similarity index 100% rename from main.d rename to src/main.d diff --git a/sums.d b/src/sums.d similarity index 100% rename from sums.d rename to src/sums.d diff --git a/tiger.d b/src/tiger.d similarity index 100% rename from tiger.d rename to src/tiger.d diff --git a/tigersumConfig.d.in b/src/tigersumConfig.d.in similarity index 100% rename from tigersumConfig.d.in rename to src/tigersumConfig.d.in