Merge branch 'master' into smarter-imports
# Conflicts: # src/module/io.c # src/vm/wren_vm.c
This commit is contained in:
+1
-1
@@ -110,7 +110,7 @@ endif
|
||||
ifneq (,$(findstring darwin,$(OS)))
|
||||
SHARED_EXT := dylib
|
||||
else
|
||||
SHARED_LIB_FLAGS := -Wl,-soname,$@.so
|
||||
SHARED_LIB_FLAGS := -Wl,-soname,libwren.so
|
||||
SHARED_EXT := so
|
||||
|
||||
# Link in the right libraries needed by libuv on Windows and Linux.
|
||||
|
||||
Reference in New Issue
Block a user