change dimension src location
This commit is contained in:
@@ -13,7 +13,7 @@ CFLAGS=-I$(INCLUDE_TOOLDIR) -I$(INCLUDE_PERMDIR) -I./src
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
DIMSRC=src/dimension_t.c
|
DIMSRC=src/dimension_t/dimension_t.c
|
||||||
DIMSRC_O=$(DIMSRC:.c=.o)
|
DIMSRC_O=$(DIMSRC:.c=.o)
|
||||||
|
|
||||||
PERMSRC_O=$(PERMDIR)/src/permutation_t/permutation_t.o
|
PERMSRC_O=$(PERMDIR)/src/permutation_t/permutation_t.o
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "dimension_t.h"
|
#include "dimension_t/dimension_t.h"
|
||||||
|
|
||||||
dimension *
|
dimension *
|
||||||
create_dim(size_t sz){
|
create_dim(size_t sz){
|
||||||
@@ -24,7 +24,7 @@ DIMDIR=$(PWD)/..
|
|||||||
|
|
||||||
PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o
|
PERMSRC_O=$(YPERMDIR)/src/permutation_t/permutation_t.o
|
||||||
|
|
||||||
DIMSRC_O=$(INCLUDE_DIR)/dimension_t.o
|
DIMSRC_O=$(INCLUDE_DIR)/dimension_t/dimension_t.o
|
||||||
|
|
||||||
TOPTARGETS := all clean
|
TOPTARGETS := all clean
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ DIR_YTEST=$PWD/../../ytest_t
|
|||||||
SRC=../src
|
SRC=../src
|
||||||
PERMSRC=$PWD/../../ypermutation_t/src
|
PERMSRC=$PWD/../../ypermutation_t/src
|
||||||
|
|
||||||
gcc -o launch_is_good_c $1 -L$DIR_YTEST $2 -lytest -I$DIR_YTEST/include_ytest/include $PERMSRC/permutation_t/permutation_t.o $PERMSRC/set_theoric_t/set_theoric_t.o $SRC/dimension_t.c -I$SRC -I$PERMSRC
|
gcc -o launch_is_good_c $1 -L$DIR_YTEST $2 -lytest -I$DIR_YTEST/include_ytest/include $PERMSRC/permutation_t/permutation_t.o $PERMSRC/set_theoric_t/set_theoric_t.o $SRC/dimension_t/dimension_t.c -I$SRC -I$PERMSRC
|
||||||
#gcc -o launch_is_good_c $1 $2 -lytest -I../include_ytest src/permutation_t/permutation_t.o src/set_theoric_t/set_theoric_t.o -I./src
|
#gcc -o launch_is_good_c $1 $2 -lytest -I../include_ytest src/permutation_t/permutation_t.o src/set_theoric_t/set_theoric_t.o -I./src
|
||||||
|
|
||||||
export LD_LIBRARY_PATH=$DIR_YTEST/:LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH=$DIR_YTEST/:LD_LIBRARY_PATH
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
|
|
||||||
//#include "permutation_t/permutation_t.h"
|
//#include "permutation_t/permutation_t.h"
|
||||||
#include "dimension_t.h"
|
#include "dimension_t/dimension_t.h"
|
||||||
|
|
||||||
TEST(dimension0){
|
TEST(dimension0){
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user