diff --git a/smi/CMakeLists.txt.64_gnu90 b/smi/CMakeLists.txt.64_gnu90 deleted file mode 100644 index 5122d588c9a21487f0fab24a78aa9c6eee1c4a70..0000000000000000000000000000000000000000 --- a/smi/CMakeLists.txt.64_gnu90 +++ /dev/null @@ -1,58 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -project (smi C) - -if($ENV{DEBUG}) -SET(DEBUGFLAGS "-g -DDEBUG") -else() -SET(DEBUGFLAGS " ") -endif() - -# RTAI -if($ENV{RTAI}) -SET(RTCFLAGS "$(shell rtai-config --lxrt-cflags) -D_RTAI -Wall -std=gnu90 --D_64") -else() -# PREEMPT_RT -SET(RTCFLAGS "-O2 -Wall -fno-stack-protector -std=gnu90 -D_64") -endif() - -SET(NRTCFLAGS "-D_NRT -D_64 -O2 -Wall -std=gnu90") - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) - -include_directories(src) - -set(RTSOURCES -src/rt_system.c -src/shm.c -src/smi.c -src/taskdisp.c -) - -set(NRTSOURCES -src/nrt_system.c -src/shm.c -src/smi_nrt.c -src/smiplay_nrt.c -src/taskdisp_nrt.c -) - -if($ENV{RTAI}) -add_library(rtsmirtai STATIC ${RTSOURCES}) -add_library(nrtsmirtai STATIC ${NRTSOURCES}) -SET_TARGET_PROPERTIES(rtsmirtai PROPERTIES COMPILE_FLAGS "${RTCFLAGS} ${DEBUGFLAGS}") -SET_TARGET_PROPERTIES(nrtsmirtai PROPERTIES COMPILE_FLAGS "${NRTCFLAGS} ${DEBUGFLAGS}") -else() -add_library(rtsmi STATIC ${RTSOURCES}) -add_library(nrtsmi STATIC ${NRTSOURCES}) -SET_TARGET_PROPERTIES(rtsmi PROPERTIES COMPILE_FLAGS "${RTCFLAGS} ${DEBUGFLAGS}") -SET_TARGET_PROPERTIES(nrtsmi PROPERTIES COMPILE_FLAGS "${NRTCFLAGS} ${DEBUGFLAGS}") -endif() - -if($ENV{RTAI}) -add_custom_target( - rtaicheck.sh - COMMAND ../bin/rtaicheck.sh -) -add_dependencies(rtsmirtai rtaicheck.sh) -endif() diff --git a/smi/CMakeLists.txt.old b/smi/CMakeLists.txt.old deleted file mode 100644 index b9e5e32c453a587f6426aed92d931ebec69bddbe..0000000000000000000000000000000000000000 --- a/smi/CMakeLists.txt.old +++ /dev/null @@ -1,57 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -project (smi C) - -if($ENV{DEBUG}) -SET(DEBUGFLAGS "-g -DDEBUG") -else() -SET(DEBUGFLAGS " ") -endif() - -# RTAI -if($ENV{RTAI}) -SET(RTCFLAGS "$(shell rtai-config --lxrt-cflags) -D_RTAI -m32 -Wall") -else() -# PREEMPT_RT -SET(RTCFLAGS "-O2 -m32 -Wall -fno-stack-protector") -endif() - -SET(NRTCFLAGS "-D_NRT -O2 -m32 -Wall") - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) - -include_directories(src) - -set(RTSOURCES -src/rt_system.c -src/shm.c -src/smi.c -src/taskdisp.c -) - -set(NRTSOURCES -src/nrt_system.c -src/shm.c -src/smi_nrt.c -src/smiplay_nrt.c -src/taskdisp_nrt.c -) - -if($ENV{RTAI}) -add_library(rtsmirtai STATIC ${RTSOURCES}) -add_library(nrtsmirtai STATIC ${NRTSOURCES}) -SET_TARGET_PROPERTIES(rtsmirtai PROPERTIES COMPILE_FLAGS "${RTCFLAGS} ${DEBUGFLAGS}") -SET_TARGET_PROPERTIES(nrtsmirtai PROPERTIES COMPILE_FLAGS "${NRTCFLAGS} ${DEBUGFLAGS}") -else() -add_library(rtsmi STATIC ${RTSOURCES}) -add_library(nrtsmi STATIC ${NRTSOURCES}) -SET_TARGET_PROPERTIES(rtsmi PROPERTIES COMPILE_FLAGS "${RTCFLAGS} ${DEBUGFLAGS}") -SET_TARGET_PROPERTIES(nrtsmi PROPERTIES COMPILE_FLAGS "${NRTCFLAGS} ${DEBUGFLAGS}") -endif() - -if($ENV{RTAI}) -add_custom_target( - rtaicheck.sh - COMMAND ../bin/rtaicheck.sh -) -add_dependencies(rtsmirtai rtaicheck.sh) -endif() diff --git a/smi/bin/Makefile b/smi/bin/Makefile index 0bfa951de7355ec2d949a35d14a8047412737bec..2aac9df84474fc5590a8b1867524e838142aefbe 100644 --- a/smi/bin/Makefile +++ b/smi/bin/Makefile @@ -27,17 +27,14 @@ smi_lib_dir_install: smi_lib_dir_fsprotect_install: export SMI_LIB_DIR=/fsprotect/system/usr/smi_lib && $(MAKE) _install -install: - export SMI_LIB_DIR=$$SMI_LIB_DIR && $(MAKE) _install - _install: - sudo mkdir -p $(SMI_LIB_DIR) - sudo cp ../build/*.a $(SMI_LIB_DIR) - sudo cp ../src/smi_def.h $(SMI_LIB_DIR) - sudo cp ../src/sys_def.h $(SMI_LIB_DIR) - sudo cp ../src/smi_user.h $(SMI_LIB_DIR) - sudo cp ../src/smi.h $(SMI_LIB_DIR) - sudo cp ../src/smi_symbols.h $(SMI_LIB_DIR) + mkdir -p $(SMI_LIB_DIR) + cp ../build/*.a $(SMI_LIB_DIR) + cp ../src/smi_def.h $(SMI_LIB_DIR) + cp ../src/sys_def.h $(SMI_LIB_DIR) + cp ../src/smi_user.h $(SMI_LIB_DIR) + cp ../src/smi.h $(SMI_LIB_DIR) + cp ../src/smi_symbols.h $(SMI_LIB_DIR) clean: -$(MAKE) clean -s -C ../build