diff options
| author | anzz1 <anzz1@live.com> | 2023-03-28 21:23:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-28 21:23:09 +0300 |
| commit | 7f4c5c66514227c3870c2bd189fb0609fdd0de10 (patch) | |
| tree | 2ea19f4fbea964e44f389a34b87b5ed5f7c97d0c | |
| parent | 2a98bc18ea34dbf15f261a0df37080e588a189d1 (diff) | |
llama : fix linkage with mingw (#551)
* Revert 7e53955 (#542)
Still needs to be fixed properly
* Fix linking on mingw32
| -rw-r--r-- | examples/embedding/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/main/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/perplexity/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/quantize/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llama.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/embedding/CMakeLists.txt b/examples/embedding/CMakeLists.txt index def5b83..88c425d 100644 --- a/examples/embedding/CMakeLists.txt +++ b/examples/embedding/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET embedding) add_executable(${TARGET} embedding.cpp) -target_link_libraries(${TARGET} PRIVATE common llama ggml ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) diff --git a/examples/main/CMakeLists.txt b/examples/main/CMakeLists.txt index aa1f794..b2dcc29 100644 --- a/examples/main/CMakeLists.txt +++ b/examples/main/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET main) add_executable(${TARGET} main.cpp) -target_link_libraries(${TARGET} PRIVATE common llama ggml ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) diff --git a/examples/perplexity/CMakeLists.txt b/examples/perplexity/CMakeLists.txt index 9bd8e37..5836df8 100644 --- a/examples/perplexity/CMakeLists.txt +++ b/examples/perplexity/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET perplexity) add_executable(${TARGET} perplexity.cpp) -target_link_libraries(${TARGET} PRIVATE common llama ggml ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) diff --git a/examples/quantize/CMakeLists.txt b/examples/quantize/CMakeLists.txt index 17a995b..fb27d45 100644 --- a/examples/quantize/CMakeLists.txt +++ b/examples/quantize/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET quantize) add_executable(${TARGET} quantize.cpp) -target_link_libraries(${TARGET} PRIVATE llama ggml ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${TARGET} PRIVATE llama ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) @@ -6,7 +6,7 @@ #include <stdbool.h> #ifdef LLAMA_SHARED -# ifdef _WIN32 +# ifdef _WIN32 && !defined __MINGW32__ # ifdef LLAMA_BUILD # define LLAMA_API __declspec(dllexport) # else |