mirror of
https://github.com/CPunch/Laika.git
synced 2024-11-24 05:31:03 +00:00
Moved vendor sources to lib/vendor
This commit is contained in:
parent
4e928464bd
commit
fb731cfe48
@ -30,6 +30,7 @@ int main(int argv, char **argc) {
|
|||||||
laikaT_pollTasks(&tService);
|
laikaT_pollTasks(&tService);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
laikaT_cleanTaskService(&tService);
|
||||||
laikaC_freeCNC(cnc);
|
laikaC_freeCNC(cnc);
|
||||||
LAIKA_DEBUG("cnc killed\n");
|
LAIKA_DEBUG("cnc killed\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -27,7 +27,7 @@ set(sodium_USE_STATIC_LIBS)
|
|||||||
find_package(Sodium)
|
find_package(Sodium)
|
||||||
|
|
||||||
# compile LaikaLib library
|
# compile LaikaLib library
|
||||||
file(GLOB_RECURSE LIBSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c)
|
file(GLOB_RECURSE LIBSOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/**.c ${CMAKE_CURRENT_SOURCE_DIR}/vendor/**.c)
|
||||||
add_library(LaikaLib STATIC ${LIBSOURCE})
|
add_library(LaikaLib STATIC ${LIBSOURCE})
|
||||||
target_link_libraries(LaikaLib PRIVATE ${sodium_LIBRARY_RELEASE})
|
target_link_libraries(LaikaLib PRIVATE ${sodium_LIBRARY_RELEASE})
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
long getTime() {
|
long getTime() {
|
||||||
struct timespec ts;
|
struct timespec ts;
|
||||||
timespec_get(&ts, TIME_UTC);
|
timespec_get(&ts, TIME_UTC);
|
||||||
return ts.tv_sec*1000 + ts.tv_nsec/1000000; /* convert nanoseconds to milliseconds */
|
return ts.tv_sec*1000 + ts.tv_nsec/1000000; /* convert time (seconds & nanoseconds) to milliseconds */
|
||||||
}
|
}
|
||||||
|
|
||||||
void laikaT_initTaskService(struct sLaika_taskService *service) {
|
void laikaT_initTaskService(struct sLaika_taskService *service) {
|
||||||
|
0
lib/src/ini.c → lib/vendor/ini.c
vendored
0
lib/src/ini.c → lib/vendor/ini.c
vendored
Loading…
Reference in New Issue
Block a user