From 455e6aa7ceb2d0af54d03c6ba3b40bfc1fd5c35b Mon Sep 17 00:00:00 2001 From: Tim Miller Date: Fri, 2 Jun 2023 00:26:55 +0900 Subject: [PATCH] Fix MSVC Build, Update C# Binding Scripts --- gpt4all-backend/dlhandle.h | 3 +++ gpt4all-bindings/csharp/build_win-mingw.ps1 | 3 +-- gpt4all-bindings/csharp/build_win-msvc.ps1 | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gpt4all-backend/dlhandle.h b/gpt4all-backend/dlhandle.h index a3b56e75..0fae068f 100644 --- a/gpt4all-backend/dlhandle.h +++ b/gpt4all-backend/dlhandle.h @@ -56,6 +56,9 @@ public: #include #include #include +#ifndef NOMINMAX + #define NOMINMAX +#endif #include #include diff --git a/gpt4all-bindings/csharp/build_win-mingw.ps1 b/gpt4all-bindings/csharp/build_win-mingw.ps1 index 8c436552..f3d17a3c 100644 --- a/gpt4all-bindings/csharp/build_win-mingw.ps1 +++ b/gpt4all-bindings/csharp/build_win-mingw.ps1 @@ -13,5 +13,4 @@ cmake --build $BUILD_DIR --parallel --config Release # copy native dlls cp "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin\*dll" $LIBS_DIR -cp "$BUILD_DIR\libllmodel.dll" $LIBS_DIR -cp "$BUILD_DIR\bin\libllama.dll" $LIBS_DIR \ No newline at end of file +cp "$BUILD_DIR\*.dll" $LIBS_DIR \ No newline at end of file diff --git a/gpt4all-bindings/csharp/build_win-msvc.ps1 b/gpt4all-bindings/csharp/build_win-msvc.ps1 index 511a4bac..01a65886 100644 --- a/gpt4all-bindings/csharp/build_win-msvc.ps1 +++ b/gpt4all-bindings/csharp/build_win-msvc.ps1 @@ -1,6 +1,5 @@ Remove-Item -Force -Recurse .\runtimes\win-x64\msvc -ErrorAction SilentlyContinue mkdir .\runtimes\win-x64\msvc\build | Out-Null -cmake -G "Visual Studio 17 2022" -A Win64 -S ..\..\gpt4all-backend -B .\runtimes\win-x64\msvc\build +cmake -G "Visual Studio 17 2022" -A X64 -S ..\..\gpt4all-backend -B .\runtimes\win-x64\msvc\build cmake --build .\runtimes\win-x64\msvc\build --parallel --config Release -cp .\runtimes\win-x64\msvc\build\Release\llmodel.dll .\runtimes\win-x64\libllmodel.dll -cp .\runtimes\win-x64\msvc\build\bin\Release\llama.dll .\runtimes\win-x64\libllama.dll \ No newline at end of file +cp .\runtimes\win-x64\msvc\build\bin\Release\*.dll .\runtimes\win-x64 \ No newline at end of file