diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e63abb..c2e117e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,11 @@ set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) # stack 16MB -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-stack_size -Wl,0x1000000") +# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-stack_size -Wl,0x1000000") # otool -lV build/ml | grep stack # set(CMAKE_CXX_FLAGS "-Wall -Wextra") -# set(CMAKE_CXX_FLAGS_RELEASE "-O3") +set(CMAKE_CXX_FLAGS_RELEASE "-O3") include_directories(/usr/local/opt/openssl/include ${CMAKE_SOURCE_DIR}/clib ${CMAKE_SOURCE_DIR}) @@ -54,7 +54,7 @@ set(SOURCE add_executable(${PROJECT_NAME} ${SOURCE}) -target_link_libraries(${PROJECT_NAME} stdc++ m ssl crypto) +target_link_libraries(${PROJECT_NAME} stdc++ m ssl crypto pthread) set(CMAKE_INSTALL_PREFIX "/usr/local") INSTALL(TARGETS ml diff --git a/utils/local_install.sh b/utils/local_install.sh index 8126b57..2db10bb 100755 --- a/utils/local_install.sh +++ b/utils/local_install.sh @@ -1,17 +1,19 @@ #!/bin/sh -gcc -std=c99 -c -O2 -o linenoise.o clib/linenoise.c -c++ -c -O2 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/table.h usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp -c++ -o ml -O2 -L/usr/local/lib -L/usr/local/opt/openssl/lib -lm -lstdc++ -lcrypto -lssl *.o +echo "cleaning" +/usr/bin/cmake --build /home/ubuntu/mlisp/build --config Release --target clean -j 4 -- +echo "building ml" +/usr/bin/cmake --build /home/ubuntu/mlisp/build --config Release --target all -j 4 -- +echo "" +echo "copying lsp files" cp stdlib/*.lsp /usr/local/var/mlisp/ -cp ml /usr/local/bin/ml - -rm *.o -rm ./ml +echo "copying ml file" +cp /home/ubuntu/mlisp/build/ml /usr/local/bin/ml +echo "" echo "if syntax has changed you may use" -echo "cp utils/Lisp.tmLanguage ~/.vscode/extensions/mattn.lisp-0.1.11/syntaxes/" +echo "cp utils/Lisp.tmLanguage ~/.vscode/extensions/mattn.lisp-0.1.12/syntaxes/" echo "" -ml -v \ No newline at end of file +ml -v