no threads

Author: ShawSumma

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/fastvm/minivm-isocline
 [submodule "vendor/raylib"]
 	path = vendor/raylib
-	url = https://github.com/raysan5/raylib
+	url = https://github.com/FastVM/minivm-raylib
 [submodule "vendor/bdwgc"]
 	path = vendor/bdwgc
-	url = https://github.com/ivmai/bdwgc
+	url = https://github.com/FastVM/minivm-bdwgc

main/minivm.c

@@ -127,5 +127,9 @@ int main(int argc, char **argv) {
         }
     }
 
+    if (isrepl) {
+        vm_repl(vm);
+    }
+
     return 0;
 }

makefile

@@ -17,8 +17,11 @@ mac: .dummy
 	$(PRE) make -Bj$(J) -C vendor/raylib/src CC="$(RAYLIB_CC)" LDFLAGS="$(OPT)" CFLAGS="-w $(OPT) $(CLFAGS) -DPLATFORM_DESKTOP" PLATFORM=PLATFORM_DESKTOP
 	$(PRE) make -Bj$(J) -f tool/core.mak $(TARGET) OS=MAC CC="$(CC)" EXE= TEST_LUA="$(TEST_LUA)" CFLAGS="-DVM_USE_RAYLIB -DVM_NO_GC $(CFLAGS)" LDFLAGS="$(MAC_RAYLIB_OBJS) -framework Cocoa -framework OpenGL -framework IOKit $(LDFLAGS)" 
 
+WINDOWS_RAYLIB_OBJS = $(RAYLIB_DIR)/rcore.o $(RAYLIB_DIR)/rglfw.o $(RAYLIB_DIR)/rshapes.o $(RAYLIB_DIR)/rtextures.o $(RAYLIB_DIR)/rtext.o $(RAYLIB_DIR)/rmodels.o $(RAYLIB_DIR)/raudio.o $(RAYLIB_DIR)/utils.o
+
 windows: .dummy
-	$(PRE) make -Bj$(J) -f tool/core.mak $(TARGET) OS=WINDOWS CC="$(CC)" EXE=.exe TEST_LUA="$(TEST_LUA)"
+	$(PRE) make -j$(J) -C vendor/raylib/src CC="$(RAYLIB_CC)" LDFLAGS="$(OPT)" CFLAGS="-w $(OPT) $(CLFAGS) -DPLATFORM_DESKTOP" PLATFORM=PLATFORM_DESKTOP OS=WINDOWS_NT
+	$(PRE) make -Bj$(J) -f tool/core.mak $(TARGET) OS=WINDOWS CC="$(CC)" EXE=.exe TEST_LUA="$(TEST_LUA)" CFLAGS="-DVM_USE_RAYLIB -DVM_NO_GC -DWIN32_LEAN_AND_MEAN $(CFLAGS)" LDFLAGS="$(RAYLIB_DIR)/libraylib.a -lopengl32 -lgdi32 -lwinmm"
 
 freebsd: .dummy
 	$(PRE) gmake -Bj$(J) -C vendor/raylib/src CC="$(RAYLIB_CC)" LDFLAGS="$(OPT)" CFLAGS="-w $(OPT) $(CLFAGS) -DPLATFORM_DESKTOP" PLATFORM=PLATFORM_DESKTOP

tool/core.mak

@@ -35,12 +35,6 @@ PROG_OBJS = $(PROG_SRCS:%.c=$(OBJ_DIR)/%.o)
 CFLAGS_VM_RAYLIB_YES = -DVM_USE_RAYLIB
 CFLAGS_VM += $(CFLAGS_VM_RAYLIB_$(RAYLIB))
 
-THREAD_SRCS_OS_WINDOWS = vendor/c11threads/threads_msvc.c
-THREAD_SRCS_OS_MAC = vendor/c11threads/threads_posix.c
-THREAD_SRCS_OS_LINUX = vendor/c11threads/threads_posix.c
-THREAD_SRCS_OS_FREEBSD = vendor/c11threads/threads_posix.c
-THREAD_SRCS += $(THREAD_SRCS_OS_$(OS))
-
 GC_SRCS += $(GC_DIR)/alloc.c $(GC_DIR)/allchblk.c $(GC_DIR)/blacklst.c $(GC_DIR)/dbg_mlc.c $(GC_DIR)/dyn_load.c $(GC_DIR)/finalize.c $(GC_DIR)/headers.c $(GC_DIR)/malloc.c $(GC_DIR)/mallocx.c $(GC_DIR)/mark.c $(GC_DIR)/mach_dep.c $(GC_DIR)/mark_rts.c $(GC_DIR)/misc.c $(GC_DIR)/new_hblk.c $(GC_DIR)/obj_map.c $(GC_DIR)/os_dep.c $(GC_DIR)/ptr_chck.c $(GC_DIR)/reclaim.c
 
 ISOCLINE_SRCS += $(ISOCLINE_DIR)/src/isocline.c