Permalink
Browse files

prepare 1.180 release

  • Loading branch information...
1 parent 4013282 commit efd6916486f99fcc73427c7e876616edb9f7f68d @viznut committed Jan 4, 2012
Showing with 47 additions and 15 deletions.
  1. +6 −3 src/Makefile
  2. +1 −0 src/Makefile.osx
  3. +35 −0 src/Makefile.win
  4. +2 −9 src/ibniz.txt
  5. +2 −2 src/texts.i
  6. +1 −1 src/vm.h
View
9 src/Makefile
@@ -14,16 +14,19 @@ clean:
rm -f *.o *~ ibniz vmtest ibniz.exe whole.c
package: clean
- cd .. && tar czf ibniz-1.1.tar.gz ibniz-1.1/
-
+ cd .. && cp -R IBNIZ ibniz-1.2 && tar czf ibniz-1.2.tar.gz ibniz-1.2
+
+winexe: clean
+ mkdir ../winbuild && cp * ../winbuild && cd ../winbuild && make -f Makefile.win
+
#$(EXE): whole.c
# $(CC) -s -O3 -ffast-math -fwhole-program whole.c -o $(EXE) $(FLAGS) -lm
#whole.c: vm_slow.c ui_sdl.c clipboard.c texts.i font.i vm.h ibniz.h
# cat ui_sdl.c vm_slow.c clipboard.c > whole.c
$(EXE): ui_sdl.o vm_slow.o clipboard.o
- $(CC) -Os ui_sdl.o vm_slow.o clipboard.o -o $(EXE) $(FLAGS) -lm
+ $(CC) -Os -s ui_sdl.o vm_slow.o clipboard.o -o $(EXE) $(FLAGS) -lm
ui_sdl.o: ui_sdl.c ibniz.h font.i vm.h texts.i vm.h
$(CC) -c -Os ui_sdl.c -o ui_sdl.o $(FLAGS)
View
1 src/Makefile.osx
@@ -31,3 +31,4 @@ font.i: font.pl
runtest: vmtest
./vmtest
+
View
35 src/Makefile.win
@@ -0,0 +1,35 @@
+# For normal builds; remove -DX11 -lX11 from flags if you don't have X11
+CC=i586-mingw32msvc-gcc
+EXE=ibniz.exe
+FLAGS=-L./SDL-1.2.14/lib -I./SDL-1.2.14/include -static -lmingw32 SDL-1.2.14/lib/libSDL.a SDL-1.2.14/lib/libSDLmain.a -mwindows -lwinmm
+all: ibniz.exe
+
+clean:
+ rm -f *.o *~ ibniz vmtest ibniz.exe whole.c
+
+package: clean
+ cd .. && cp -R IBNIZ ibniz-1.2 && tar czf ibniz-1.2.tar.gz ibniz-1.2
+
+$(EXE): whole.c
+ $(CC) -s -O3 -ffast-math -fwhole-program whole.c -o $(EXE) $(FLAGS) -lm
+
+whole.c: vm_slow.c ui_sdl.c clipboard.c texts.i font.i vm.h ibniz.h
+ cat ui_sdl.c vm_slow.c clipboard.c > whole.c
+
+ui_sdl.o: ui_sdl.c ibniz.h font.i vm.h texts.i vm.h
+ $(CC) -c -Os ui_sdl.c -o ui_sdl.o $(FLAGS)
+
+clipboard.o: clipboard.c ibniz.h
+ $(CC) -c -Os clipboard.c -o clipboard.o $(FLAGS)
+
+vm_slow.o: vm_slow.c ibniz.h vm.h
+ $(CC) -c -O3 vm_slow.c -o vm_slow.o
+
+font.i: font.pl
+ perl font.pl > font.i
+
+runtest: vmtest
+ ./vmtest
+
+vmtest: vm_test.c vm_slow.c
+ gcc vm_test.c vm_slow.c -o vmtest -lm
View
11 src/ibniz.txt
@@ -506,19 +506,12 @@ v7rs6ldv*vv*7&@xr.8&$b
- More examples included in the distribution package
- Help screen implemented
-1.2000 (already there)
+1.1800
- Clipboard bugs fixed, window icon added
+- Machine status panel implemented
=== FUTURE ===
-1.2000 (TODO!)
-- Include a machine status panel
-
-1.3000 (TODO!)
-- Analyzer; execution speed increase
- - for interpreter: pseudo-opcodes to separate y-loop and t-loop
- - for compiler
-
Tasks in an approximate order of priority:
- Fix problems that prevent IBNIZ from working in some systems
- Fix other known bugs
View
4 src/texts.i
@@ -10,14 +10,14 @@ char*usagetext=
// " -M(edia) Dump media data (YUV video to stdout)\n"
char*versiontext=
- "IBNIZ version 1.12-NONRELEASE";
+ "IBNIZ version 1.1180";
char*welcometext=
"\n"
"\n"
"\n"
"\n"
- "\\ IBNIZ 1.12-NONRELEASE\n"
+ "\\ IBNIZ 1.1180\n"
"\\\n"
"\\ Press f12 for help.\n";
View
2 src/vm.h
@@ -45,4 +45,4 @@ GLOBAL struct
int32_t mem[MEMSIZE];
} vm;
-#endif
+#endif

0 comments on commit efd6916

Please sign in to comment.