more reorganization
This commit is contained in:
parent
c7286925cc
commit
7801d1af76
|
|
@ -10,7 +10,7 @@
|
|||
**/*.so
|
||||
/install_manifest.txt
|
||||
a.out
|
||||
**/*/pcloudcc
|
||||
cmd/pcloudcc/build/pcloudcc
|
||||
**/*/.cache/
|
||||
**/*/compile_commands.json
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ set (CMAKE_C_FLAGS "-fPIC")
|
|||
set (PCLSYNC_PATH ${CMAKE_SOURCE_DIR}/lib/pclsync)
|
||||
set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls)
|
||||
set (SQLITE3_PATH ${CMAKE_SOURCE_DIR}/lib/sqlite)
|
||||
set (CMD_PATH ${CMAKE_SOURCE_DIR}/cmd/pcloudcc)
|
||||
|
||||
#add_subdirectory(${MBEDTLS_PATH})
|
||||
|
||||
|
|
@ -52,12 +53,12 @@ include_directories(${OVERLAY_CLENT_PATH})
|
|||
add_library(sqlite3 STATIC ${SQLITE3_PATH}/sqlite3.c)
|
||||
target_link_libraries(sqlite3 z dl)
|
||||
|
||||
add_library(pcloudcc_lib SHARED pclsync_lib_c.cpp pclsync_lib.cpp control_tools.cpp ${OVERLAY_CLENT_PATH}/overlay_client.c ${OVERLAY_CLENT_PATH}/debug.c )
|
||||
add_library(pcloudcc_lib SHARED ${CMD_PATH}/pclsync_lib_c.cpp ${CMD_PATH}/pclsync_lib.cpp ${CMD_PATH}/control_tools.cpp ${OVERLAY_CLENT_PATH}/overlay_client.c ${OVERLAY_CLENT_PATH}/debug.c )
|
||||
|
||||
target_link_libraries(pcloudcc_lib ${PCLSYNC_PATH}/psynclib.a ${MBEDTLS_PATH}/build/library/libmbedtls.a fuse pthread sqlite3 udev
|
||||
)
|
||||
|
||||
add_executable(pcloudcc main.cpp)
|
||||
add_executable(pcloudcc ${CMD_PATH}/main.cpp)
|
||||
|
||||
target_link_libraries(pcloudcc pcloudcc_lib)
|
||||
|
||||
|
|
|
|||
12
Makefile
12
Makefile
|
|
@ -1,14 +1,14 @@
|
|||
all:
|
||||
make -C lib/pclsync fs
|
||||
make -C ./lib/pclsync fs
|
||||
cmake -H./lib/mbedtls -B./lib/mbedtls/build
|
||||
make -C lib/mbedtls/build
|
||||
mkdir -p build
|
||||
cmake -H. -B./build
|
||||
make -C build
|
||||
make -C ./lib/mbedtls/build
|
||||
mkdir -p ./cmd/pcloudcc/build
|
||||
cmake -H. -B./cmd/pcloudcc/build
|
||||
make -C ./cmd/pcloudcc/build
|
||||
|
||||
clean:
|
||||
make -C lib/pclsync clean
|
||||
rm -rf lib/mbedtls/build
|
||||
rm -rf ./build
|
||||
rm -rf ./cmd/pcloudcc/build
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue