Permalink
Browse files

undid giafs Makefile changes

  • Loading branch information...
FreyJo committed Oct 16, 2018
1 parent d51873f commit 427e4af202b32bf77a44f894e60a1a1ec28f72a7
Showing with 3 additions and 36 deletions.
  1. +0 −33 Makefile
  2. +3 −3 Makefile.rule
@@ -70,7 +70,6 @@ OBJS += acados/utils/external_function_generic.o
# acados dependencies
STATIC_DEPS = blasfeo_static hpipm_static
SHARED_DEPS = blasfeo_shared hpipm_shared
CLEAN_DEPS = blasfeo_clean hpipm_clean
ifeq ($(ACADOS_WITH_QPOASES), 1)
STATIC_DEPS += qpoases_static
@@ -102,43 +101,20 @@ acados_static: $(STATIC_DEPS)
@echo " libacore.a static library build complete."
@echo
acados_shared: $(SHARED_DEPS)
( cd acados; $(MAKE) obj TOP=$(TOP) )
gcc -L./lib -shared -o libacore.so $(OBJS) -lhpipm -lblasfeo
mkdir -p lib
mv libacore.so lib
@echo
@echo " libacore.so shared library build complete."
@echo
blasfeo_static:
( cd $(BLASFEO_PATH); $(MAKE) static_library CC=$(CC) LA=$(BLASFEO_VERSION) TARGET=$(BLASFEO_TARGET) )
mkdir -p include/blasfeo/include
mkdir -p lib
cp $(BLASFEO_PATH)/include/*.h include/blasfeo/include
cp $(BLASFEO_PATH)/lib/libblasfeo.a lib
blasfeo_shared:
( cd $(BLASFEO_PATH); $(MAKE) shared_library CC=$(CC) LA=$(BLASFEO_VERSION) TARGET=$(BLASFEO_TARGET) )
mkdir -p include/blasfeo/include
mkdir -p lib
cp $(BLASFEO_PATH)/include/*.h include/blasfeo/include
cp $(BLASFEO_PATH)/lib/libblasfeo.so lib
hpipm_static: blasfeo_static
( cd $(HPIPM_PATH); $(MAKE) static_library CC=$(CC) TARGET=$(HPIPM_TARGET) BLASFEO_PATH=$(BLASFEO_PATH) )
mkdir -p include/hpipm/include
mkdir -p lib
cp $(HPIPM_PATH)/include/*.h include/hpipm/include
cp $(HPIPM_PATH)/lib/libhpipm.a lib
hpipm_shared: blasfeo_shared
( cd $(HPIPM_PATH); $(MAKE) shared_library CC=$(CC) TARGET=$(HPIPM_TARGET) BLASFEO_PATH=$(BLASFEO_PATH) )
mkdir -p include/hpipm/include
mkdir -p lib
cp $(HPIPM_PATH)/include/*.h include/hpipm/include
cp $(HPIPM_PATH)/lib/libhpipm.so lib
hpmpc_static: blasfeo_static
( cd $(HPMPC_PATH); $(MAKE) static_library CC=$(CC) TARGET=$(HPMPC_TARGET) BLASFEO_PATH=$(BLASFEO_PATH) )
mkdir -p include/hpmpc/include
@@ -187,15 +163,6 @@ ifeq ($(ACADOS_WITH_C_INTERFACE), 1)
mv interfaces/acados_c/libacados_c.a lib
endif
acados_c_shared: acados_shared
ifeq ($(ACADOS_WITH_C_INTERFACE), 1)
( cd interfaces/acados_c; $(MAKE) shared_library CC=$(CC) TOP=$(TOP) )
mkdir -p include/acados_c
mkdir -p lib
cp -r interfaces/acados_c/*.h include/acados_c
mv interfaces/acados_c/libacados_c.so lib
endif
examples_c: acados_c_static
( cd examples/c; $(MAKE) examples TOP=$(TOP) )
@@ -31,10 +31,10 @@ BLASFEO_VERSION = HIGH_PERFORMANCE
# BLASFEO_VERSION = REFERENCE
# BLASFEO_VERSION = BLAS_WRAPPER
## BLASFEO target
# BLASFEO_TARGET = X64_INTEL_HASWELL
BLASFEO_TARGET = X64_INTEL_HASWELL
# BLASFEO_TARGET = X64_INTEL_SANDY_BRIDGE
# BLASFEO_TARGET = X64_INTEL_CORE
BLASFEO_TARGET = GENERIC
# BLASFEO_TARGET = GENERIC
## HPIPM path
HPIPM_PATH = $(EXT_PATH)/hpipm
@@ -61,7 +61,7 @@ QPDUNES_PATH = $(EXT_PATH)/qpdunes
ACADOS_WITH_OPENMP = 0
# include QPOASES
ACADOS_WITH_QPOASES = 0
ACADOS_WITH_QPOASES = 1
# include HPMPC
ACADOS_WITH_HPMPC = 0

0 comments on commit 427e4af

Please sign in to comment.