Browse Source

Build from system Kuroko

K. Lange 1 year ago
parent
commit
acaf23ca21
5 changed files with 3 additions and 17 deletions
  1. 0 3
      .gitmodules
  2. 1 9
      Makefile
  3. 2 1
      bim-core.h
  4. 0 3
      bim.c
  5. 0 1
      kuroko

+ 0 - 3
.gitmodules

@@ -1,3 +0,0 @@
-[submodule "kuroko"]
-	path = kuroko
-	url = git@github.com:kuroko-lang/kuroko

+ 1 - 9
Makefile

@@ -1,6 +1,5 @@
 TARGET=bim
 CFLAGS=-g -flto -std=c99 -Wvla -pedantic -Wall -Wextra -I. $(shell bash docs/git-tag) -Wno-unused-parameter
-LDFLAGS=-Wl,-rpath -Wl,'$$ORIGIN' -L.
 LDLIBS=-lkuroko -ldl
 
 prefix=/usr/local
@@ -14,7 +13,6 @@ INSTALL_PROGRAM=$(INSTALL)
 INSTALL_DATA=$(INSTALL) -m 644
 
 SYNTAXES = $(patsubst %.c, %.o, $(sort $(wildcard syntax/*.c)))
-KUROKO = libkuroko.so
 HEADERS = $(wildcard bim-*.h)
 
 .PHONY: all clean distclean install install-strip uninstall
@@ -24,22 +22,16 @@ all: $(TARGET)
 syntax/*.o: $(HEADERS)
 *.o: $(HEADERS)
 
-bim: bim.o $(SYNTAXES) $(KUROKO)
-
-libkuroko.so: kuroko/src/*.c kuroko/src/**.h
-	$(MAKE) -C kuroko
-	cp kuroko/libkuroko.so ./
+bim: bim.o
 
 clean:
 	-rm -f $(TARGET) bim.o $(SYNTAXES)
-	$(MAKE) -C kuroko $@
 
 distclean: clean
 
 install: all
 	mkdir -p $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
-	$(INSTALL_PROGRAM) libkuroko.so $(DESTDIR)$(bindir)/libkuroko.so
 	mkdir -p $(DESTDIR)$(datadir)/bim/themes
 	$(INSTALL_DATA) themes/*.krk $(DESTDIR)$(datadir)/bim/themes/
 	mkdir -p $(DESTDIR)$(datadir)/bim/syntax

+ 2 - 1
bim-core.h

@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <kuroko/vm.h>
 
 #ifdef __DATE__
 # define BIM_BUILD_DATE " built " __DATE__ " at " __TIME__
@@ -35,7 +36,7 @@
 # define TAG "-alpha"
 #endif
 
-#define BIM_VERSION   "3.0.0" TAG
+#define BIM_VERSION   "2.99.0" TAG
 #define BIM_COPYRIGHT "Copyright 2012-2021 K. Lange <\033[3mklange@toaruos.org\033[23m>"
 
 #define BLOCK_SIZE 4096

+ 0 - 3
bim.c

@@ -15,9 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "bim-core.h"
-#include "kuroko/src/kuroko.h"
-#include "kuroko/src/vm.h"
-#include "kuroko/src/debug.h"
 
 global_config_t global_config = {
 	/* State */

+ 0 - 1
kuroko

@@ -1 +0,0 @@
-Subproject commit 4eceb98ffed5c49f57d362887134613a2c6733ba