Skip to content

fix: duplicate backend library files #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
giladgd wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −11
Open

fix: duplicate backend library files #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b0957
fix: duplicate backend library files
giladgd Jan 11, 2026
492dc59
fix: bugs
giladgd Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions llama/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ endif()

add_definitions(-DNAPI_VERSION=7)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_PLATFORM_NO_VERSIONED_SONAME ON)

set(LLAMA_BUILD_COMMON ON)

Expand Down
10 changes: 5 additions & 5 deletions llama/addon/globals/addonLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ void addonLlamaCppLogCallback(ggml_log_level level, const char* text, void* user
}

Napi::Value setLogger(const Napi::CallbackInfo& info) {
if (info.Length() < 1 || !info[0].IsFunction()) {
if (addonJsLoggerCallbackSet) {
addonJsLoggerCallbackSet = false;
addonThreadSafeLoggerCallback.Release();
}
if (addonJsLoggerCallbackSet) {
addonJsLoggerCallbackSet = false;
addonThreadSafeLoggerCallback.Release();
}

if (info.Length() < 1 || !info[0].IsFunction()) {
return info.Env().Undefined();
}

Expand Down
2 changes: 1 addition & 1 deletion llama/cmake/addVariantSuffix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function(addVariantSuffix originalTarget variantSuffix)
if (NOT TARGET ${originalTarget} OR variantSuffix STREQUAL "")
if (NOT TARGET ${originalTarget} OR ${variantSuffix} STREQUAL "")
return()
endif()

Expand Down
9 changes: 4 additions & 5 deletions templates/electron-typescript-react/src/utils/createRendererSideBirpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {createBirpc} from "birpc";

export function createRendererSideBirpc<
const RendererFunction = Record<string, never>,
const ElectronFunctions extends object = Record<string, never>
const ElectronFunction = Record<string, never>,
const RendererFunctions extends object = Record<string, never>
>(
toRendererEventName: string,
fromRendererEventName: string,
electronFunctions: ElectronFunctions
rendererFunctions: RendererFunctions
) {
return createBirpc<RendererFunction, ElectronFunctions>(electronFunctions, {
return createBirpc<ElectronFunction, RendererFunctions>(rendererFunctions, {
post: (data) => window.ipcRenderer.send(fromRendererEventName, data),
on: (onData) => window.ipcRenderer.on(toRendererEventName, (event, data) => {
onData(data);
Expand All @@ -17,4 +17,3 @@ export function createRendererSideBirpc<
deserialize: (value) => JSON.parse(value)
});
}

Loading