--- Makefile~   Thu Nov 10 05:14:20 2005
+++ Makefile    Fri Nov 11 11:25:12 2005
@@ -1,9 +1,14 @@
 ### CONFIG
 
-CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -DCOMPACT_TABLE
+#CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -DCOMPACT_TABLE
+CFLAGS = -Wall -O3 -fomit-frame-pointer -I vm -I /usr/local/include -DCOMPACT_TABLE
 MAKESO = gcc -shared -WBsymbolic
-LIBNEKO_LIBS = -ldl -lgc -lm
-LIBNEKO = -Lbin -lneko
+#LIBNEKO_LIBS = -ldl -lgc -lm
+#LIBNEKO_LIBS = -L/usr/local/lib -lgc -lm
+LIBNEKO_LIBS = bin/gc.dll
+#LIBNEKO = -Lbin -lneko
+LIBNEKO = bin/libneko.dll
+LIBSOCK = -lws2_32
 
 NEKO_EXEC = LD_LIBRARY_PATH=../bin:${LD_LIBRARY_PATH} NEKOPATH=../boot ../bin/nekovm
 
@@ -32,7 +37,8 @@
 
 all: libneko nekovm std compiler libs
 
-libneko: bin/libneko.so
+#libneko: bin/libneko.so
+libneko: bin/libneko.dll
 
 libs:
        (cd src; ${NEKO_EXEC} neko/Main tools/install.neko)
@@ -57,19 +63,50 @@
        cp src/neko/*.n bin/std/neko
        cp src/nekoml/*.n bin/std/nekoml
 
-bin/libneko.so: ${LIBNEKO_OBJECTS}
+#bin/libneko.so: ${LIBNEKO_OBJECTS}
+bin/libneko.dll: ${LIBNEKO_OBJECTS}
        ${MAKESO} ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS} -o $@
 
 bin/nekovm: $(VM_OBJECTS)
        ${CC} ${CFLAGS} ${VM_OBJECTS} ${LIBNEKO} -o $@
 
 bin/std.ndll: ${STD_OBJECTS}
-       ${MAKESO} ${STD_OBJECTS} ${LIBNEKO} -o $@
+       ${MAKESO} ${STD_OBJECTS} ${LIBNEKO} ${LIBSOCK} -o $@
 
 clean:
-       rm -rf bin/libneko.so bin/nekovm ${LIBNEKO_OBJECTS} ${VM_OBJECTS}
+       rm -rf bin/libneko.dll bin/nekovm ${LIBNEKO_OBJECTS} ${VM_OBJECTS}
        rm -rf bin/std bin/*.ndll libs/*/*.o
        rm -rf src/*.n src/neko/*.n src/nekoml/*.n src/tools/*.n
+
+vm/alloc.o: vm/alloc.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/builtins.o: vm/builtins.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/callback.o: vm/callback.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/context.o: vm/context.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/interp.o: vm/interp.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/load.o: vm/load.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/objtable.o: vm/objtable.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/others.o: vm/others.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/hash.o: vm/hash.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
+
+vm/module.o: vm/module.c
+       ${CC} ${CFLAGS} -DNEKO_SOURCES -c $< -o $@
 
 .SUFFIXES : .c .o