Updated .gitignore; Improved makefiles and scripts, updated SDL2.h0

.gitignore

@@ -5,3 +5,9 @@ bin/*
 *.dll
 src/*.o
 src/*.sym
+data/bin/voc/C
+data/bin/voc/bin
+data/bin/voc/lib
+data/bin/voc/src/Configuration.Make
+data/bin/voc/src/Configuration.Mod
+data/bin/voc/src/voc.exe

data/bin/voc/src/Configuration.Make

@@ -1,15 +0,0 @@
-OLANGDIR=/home/kekc/prg/FreeOberon/data/bin/voc/src
-COMPILER=gcc
-OS=debian
-VERSION=2.1.0
-ONAME=voc
-DATAMODEL=LP64
-ADRSIZE=8
-ALIGNMENT=8
-INSTALLDIR=/opt/voc
-PLATFORM=unix
-BINEXT=
-DYNEXT=.so
-COMPILE=gcc -fPIC -g
-STATICLINK= -static
-BRANCH=

data/bin/voc/src/Configuration.Mod

@@ -1,18 +0,0 @@
-MODULE Configuration;
-CONST
-  name*        = 'voc';
-  objext*      = '.o';
-  objflag*     = ' -o ';
-  linkflags*   = ' -L"';
-  libspec*     = ' -l voc';
-  libext*      = '';
-  os*          = 'debian';
-  compiler*    = 'gcc';
-  compile*     = 'gcc -fPIC -g';
-  installdir*  = '/opt/voc';
-  staticLink*  = ' -static';
-VAR
-  versionLong-: ARRAY 42 OF CHAR;
-BEGIN
-  versionLong := '2.1.0 [2017/07/18] for gcc LP64 on debian';
-END Configuration.

data/bin/voc/src/move_files.sh

@@ -6,3 +6,5 @@ mkdir ../lib
 mv install/lib/libvoc-OC.a ../lib
 mv install/lib/libvoc-OC.so ../lib
 rm -rf install
+rm -rf build/*
+rm voc.exe

src/Makefile_linux

@@ -44,9 +44,13 @@ Graph.sym: Graph.Mod SDL2.sym
 SDL2.sym: SDL2.Mod
 	voc -OC -cesF SDL2.Mod
 
-.PHONY: clean install
+.PHONY: clean cleanall install
+
 clean:
-	rm -f *.c *.h *.o *.sym term/term.o .tmp..* ../Programs/.tmp..* ../$(PROG) ../bin/*
+	rm -f *.c *.h *.o *.sym term/term.o .tmp..* ../Programs/.tmp..*
+
+cleanall: clean
+	rm -f ../$(PROG) ../bin/*
 
 install:
 	cp Graph.sym SDL2.sym /opt/voc/C/sym

src/Makefile_win32

@@ -44,9 +44,13 @@ Graph.sym: Graph.Mod SDL2.sym
 SDL2.sym: SDL2.Mod
 	voc -OC -cesF SDL2.Mod
 
-.PHONY: clean install
+.PHONY: clean cleanall install
+
 clean:
-	rm -f *.c *.h *.o *.sym term/term.o .tmp..* ../Programs/.tmp..* ../$(PROG).exe ../bin/*
+	rm -f *.c *.h *.o *.sym term/term.o .tmp..* ../Programs/.tmp..*
+
+cleanall: clean
+	rm -f ../$(PROG).exe ../bin/*
 
 install:
 	cp Graph.sym SDL2.sym ../data/bin/voc/C/sym

src/SDL2.h0

@@ -25,15 +25,15 @@ extern void SDL_DestroyTexture(void *);
 extern int SDL_FillRect(void *, void *, UINT32);
 extern void SDL_FreeSurface(void *);
 extern int SDL_GetDesktopDisplayMode(int, void *);
-extern void *SDL_GetError();
+extern void *SDL_GetError(void);
 extern void *SDL_GetKeyboardState(void *);
 extern UINT32 SDL_GetMouseState(void *, void *);
-extern UINT32 SDL_GetTicks();
+extern UINT32 SDL_GetTicks(void);
 extern UINT32 SDL_GetWindowFlags(void *);
 extern void SDL_GetWindowSize(void *, void *, void *);
 extern int IMG_Init(int);
 extern void *IMG_Load(void *);
-extern void IMG_Quit();
+extern void IMG_Quit(void);
 extern int SDL_Init(UINT32);
 extern void *SDL_LoadBMP_RW(void *, int);
 extern int SDL_LockSurface(void *);
@@ -41,7 +41,7 @@ extern UINT32 SDL_MapRGB(void *, UINT8, UINT8, UINT8);
 extern int SDL_PollEvent(void *);
 extern int SDL_WaitEvent(void *);
 extern int SDL_WaitEventTimeout(void *, int timeout);
-extern void SDL_Quit();
+extern void SDL_Quit(void);
 extern void *SDL_RWFromFile(void *, void *);
 extern int SDL_RenderClear(void *);
 extern int SDL_RenderCopy(void *, void *, void *, void *);
@@ -61,5 +61,10 @@ extern void SDL_SetWindowSize(void *, int, int);
 extern void SDL_SetWindowTitle(void *, void *);
 extern int SDL_ShowCursor(int);
 extern void SDL_UnlockSurface(void *);
+extern void SDL_StartTextInput(void);
+extern void SDL_StopTextInput(void);
+extern int SDL_HasEvent(int);
+extern int SDL_HasEvents(int, int);
+extern int SDL_PeepEvents(void *, int, int, int, int);
 
 #endif