Skip to content

Commit

Permalink
use link flags for essentia instead of specifying libessentia.a as in…
Browse files Browse the repository at this point in the history
…put file
  • Loading branch information
jmarcosfer committed Jan 7, 2024
1 parent eb83a1d commit b31ff3e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile.essentiajs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ build:

@echo "Linking and compiling the bindings with essentia to js, wasm files ..."
@echo "compiling async builds..."
@emcc -lembind -Oz $(BUILD_DIR_ES)/bindings_essentiajs.o $(BUILD_DIR_ES)/essentiajs.o ${LIB_DIR_ESSENTIA}/libessentia.a \
-L $(LIB_DIR_ESSENTIA) \
@emcc -Oz $(BUILD_DIR_ES)/bindings_essentiajs.o $(BUILD_DIR_ES)/essentiajs.o \
-lembind -lessentia -L $(LIB_DIR_ESSENTIA) \
-s WASM=1 \
-o $(ESSENTIA_JS_WEB) \
-s EXCEPTION_DEBUG \
Expand All @@ -57,8 +57,8 @@ build:
@echo "Done ..."

@echo "compiling sync builds..."
@emcc --bind -Oz $(BUILD_DIR_ES)/bindings_essentiajs.o $(BUILD_DIR_ES)/essentiajs.o ${LIB_DIR_ESSENTIA}/libessentia.a \
-L $(LIB_DIR_ESSENTIA) \
@emcc -Oz $(BUILD_DIR_ES)/bindings_essentiajs.o $(BUILD_DIR_ES)/essentiajs.o \
-lembind -lessentia -L $(LIB_DIR_ESSENTIA) \
-s WASM=1 \
-o $(ESSENTIA_JS_MODULE) \
-s BINARYEN_ASYNC_COMPILATION=0 \
Expand Down
8 changes: 4 additions & 4 deletions Makefile2.essentiajs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ build:
@echo "Compiling + linking emscripten embind cpp bindings directly to js, wasm files ..."

@echo "... compiling async builds..."
@emcc -lembind -Oz $(BINDING_ESSENTIAJS) $(INCLUDE_ESSENTIAJS) ${LIB_DIR_ESSENTIA}/libessentia.a \
-L $(LIB_DIR_ESSENTIA) \
@emcc -lembind -Oz $(BINDING_ESSENTIAJS) $(INCLUDE_ESSENTIAJS) \
-lembind -lessentia -L $(LIB_DIR_ESSENTIA) \
-I $(EIGEN_PATH) -I $(INCLUDE_DIR_ESSENTIA)\
-s WASM=1 \
-o $(ESSENTIA_JS_WEB) \
Expand All @@ -46,8 +46,8 @@ build:
@echo "Done ..."

@echo "... compiling sync builds..."
@emcc --bind -Oz $(BINDING_ESSENTIAJS) $(INCLUDE_ESSENTIAJS) ${LIB_DIR_ESSENTIA}/libessentia.a \
-L $(LIB_DIR_ESSENTIA) \
@emcc --bind -Oz $(BINDING_ESSENTIAJS) $(INCLUDE_ESSENTIAJS) \
-lembind -lessentia -L $(LIB_DIR_ESSENTIA) \
-I $(EIGEN_PATH) -I $(INCLUDE_DIR_ESSENTIA)\
-s WASM=1 \
-o $(ESSENTIA_JS_MODULE) \
Expand Down

0 comments on commit b31ff3e

Please sign in to comment.