Windows version fixup

src/Makefile_linux

@@ -1,94 +0,0 @@
-PROG=FreeOberon
-OS=linux
-VOCDIR=../Data/bin/voc/install
-VOC=$(VOCDIR)/bin/voc
-CC=gcc
-SDL2Opts=`sdl2-config --cflags --libs`
-VER=1.1.0
-
-all: prepare voc fo install
-
-fo: ../$(PROG)
-
-../$(PROG): $(PROG).o
-	$(CC) -fPIC -g -I ../Data/bin/voc/C/include \
-		-o $(PROG) $(PROG).o Graph.o SDL2.o \
-		OV.o Editor.o Term.o Terminal.o \
-		EditorText.o Config.o term/term.o \
-		$(VOCDIR)/lib/libvoc-OC.a \
-		$(SDL2Opts) -lSDL2_image && \
-		mv $(PROG) ..
-
-$(PROG).o: $(PROG).Mod EditorText.sym Terminal.sym OV.sym \
-		Editor.sym Term.sym Graph.sym SDL2.sym Int.sym
-	$(VOC) -OC -cesF -m $(PROG).Mod
-
-OV.sym: OV.Mod Terminal.sym Graph.sym
-	$(VOC) -OC -cesF OV.Mod
-
-Editor.sym: Editor.Mod Terminal.sym EditorText.sym OV.sym Graph.sym
-	$(VOC) -OC -cesF Editor.Mod
-
-Term.sym: Term.Mod term/term.o
-	$(VOC) -OC -cesF Term.Mod
-
-Terminal.sym: Terminal.Mod Graph.sym
-	$(VOC) -OC -cesF Terminal.Mod
-
-EditorText.sym: EditorText.Mod Config.sym
-	$(VOC) -OC -cesF EditorText.Mod
-
-Config.sym: Config_$(OS).Mod
-	$(VOC) -OC -cesF Config_$(OS).Mod
-
-term/term.o: term/term_$(OS).c
-	$(CC) -c term/term_$(OS).c -o term/term.o
-
-Graph.sym: Graph.Mod SDL2.sym
-	$(VOC) -OC -cesF Graph.Mod
-
-Int.sym: Int.Mod
-	$(VOC) -OC -cesF Int.Mod
-
-SDL2.sym: SDL2.Mod
-	$(VOC) -OC -cesF SDL2.Mod
-
-.PHONY: clean cleanfo cleanall install pack prepare
-
-cleanfo:
-	rm -f *.c *.h *.o *.sym term/term.o .tmp..* \
-		../Programs/.tmp..* ../bin/*
-
-clean: cleanfo
-	make -C ../Data/bin/voc clean
-
-cleanall: clean
-	rm -f ../$(PROG) ../$(PROG).exe
-	make -C ../Data/bin/voc cleanall
-
-prepare:
-	chmod +x ../Data/bin/*.sh
-
-pack: clean prepare
-	rm -rf Makefile ../$(PROG) ../*.exe ../*.dll \
-		$(VOCDIR)/src/*.exe
-	ln -s Makefile_linux Makefile
-	$(eval TMPDIR := $(shell mktemp -d /tmp/FreeOberon_XXXXXX))
-	mkdir -p $(TMPDIR)/FreeOberon
-	cp -r ../* $(TMPDIR)/FreeOberon
-	rm -rf $(TMPDIR)/FreeOberon/Data/bin/mingw32 \
-		$(TMPDIR)/FreeOberon/Data/bin/voc/bin \
-		$(TMPDIR)/FreeOberon/Data/bin/voc/C \
-		$(TMPDIR)/FreeOberon/Data/bin/voc/lib
-	tar czf ../../FreeOberon_v$(VER).tar.gz -C $(TMPDIR) FreeOberon
-	rm -rf $(TMPDIR)
-
-voc:
-	make -C ../Data/bin/voc full
-
-install:
-	cp Graph.sym SDL2.sym Int.sym $(VOCDIR)/C/sym
-	cp Graph.h SDL2.h SDL2.h0 Int.h $(VOCDIR)/C/include
-	cp Graph.o SDL2.o Int.o $(VOCDIR)/lib
-	mkdir -p ../bin
-

src/Makefile_win32

@@ -1,77 +0,0 @@
-PROG=FreeOberon
-OS=win32
-VOCDIR=../Data/bin/voc/install
-VOC=$(VOCDIR)/bin/voc
-CC=gcc
-SDL2Opts=-w -Wl,-subsystem,windows -lmingw32 -lSDL2main -lSDL2
-
-all: voc fo install
-
-fo: ../$(PROG).exe
-
-../$(PROG).exe: $(PROG).o resources.o
-	$(CC) -fPIC -g -I "$(VOCDIR)/C/include" \
-		-o $(PROG).exe $(PROG).o Graph.o SDL2.o \
-		OV.o Editor.o Term.o Terminal.o \
-		EditorText.o Config.o term/term.o \
-		resources.o \
-		$(VOCDIR)/lib/libvoc-OC.a \
-		$(SDL2Opts) -lSDL2_image && \
-		mv $(PROG).exe ..
-
-$(PROG).o: $(PROG).Mod EditorText.sym Terminal.sym OV.sym \
-		Editor.sym Term.sym Graph.sym SDL2.sym Int.sym
-	$(VOC) -OC -cesF -m $(PROG).Mod
-
-OV.sym: OV.Mod Terminal.sym Graph.sym
-	$(VOC) -OC -cesF OV.Mod
-
-Editor.sym: Editor.Mod Terminal.sym EditorText.sym OV.sym Graph.sym
-	$(VOC) -OC -cesF Editor.Mod
-
-Term.sym: Term.Mod term/term.o
-	$(VOC) -OC -cesF Term.Mod
-
-Terminal.sym: Terminal.Mod Graph.sym
-	$(VOC) -OC -cesF Terminal.Mod
-
-EditorText.sym: EditorText.Mod Config.sym
-	$(VOC) -OC -cesF EditorText.Mod
-
-Config.sym: Config_$(OS).Mod
-	$(VOC) -OC -cesF Config_$(OS).Mod
-
-term/term.o: term/term_$(OS).c
-	$(CC) -c term/term_$(OS).c -o term/term.o
-
-Graph.sym: Graph.Mod SDL2.sym
-	$(VOC) -OC -cesF Graph.Mod
-
-Int.sym: Int.Mod
-	$(VOC) -OC -cesF Int.Mod
-
-SDL2.sym: SDL2.Mod
-	$(VOC) -OC -cesF SDL2.Mod
-
-resources.o: resources.rc
-	windres resources.rc resources.o
-
-.PHONY: clean cleanall install
-
-clean:
-	rm -f *.c *.h *.o *.sym term/term.o .tmp..* \
-		../Programs/.tmp..* ../bin/*
-	make -C ../Data/bin/voc clean
-
-cleanall: clean
-	rm -f ../$(PROG) ../$(PROG).exe
-	make -C ../Data/bin/voc cleanall
-
-voc:
-	make -C ../Data/bin/voc full
-
-install:
-	cp Graph.sym SDL2.sym Int.sym $(VOCDIR)/C/sym
-	cp Graph.h SDL2.h SDL2.h0 Int.h $(VOCDIR)/C/include
-	cp Graph.o SDL2.o Int.o $(VOCDIR)/lib
-	mkdir -p ../bin

src/TESTGTEST.BAT

@@ -1 +0,0 @@
-compile_GTest & cd .. & GTest & cd src

src/eT

@@ -1,2 +0,0 @@
-#!/bin/bash
-vim -p Tetragon.Mod TermBox.Mod Graph2.Mod Allegro5.Mod

src/make.bat

@@ -104,8 +104,8 @@ windres resources.rc resources.o
   -lallegro -lallegro_primitives -lallegro_image ^
   -I..\Data\bin\mingw32\include ^
   -Wl,-e_WinMain@16 ^
-  -nostartfiles %OFRDIR%\..\..\Mod\Lib\crt1.c
-REM  -Wl,-subsystem,windows
+  -nostartfiles %OFRDIR%\..\..\Mod\Lib\crt1.c ^
+  -Wl,-subsystem,windows
 
 @GOTO QUIT
 :ERR