Changeset 366 for Whitix/trunk/user

Timestamp:

04/25/08 23:37:15 (7 months ago)

Author:

mwhitworth

Message:

Remove whitix64 branch, made a mistake while branching.

Location:

Whitix/trunk/user/xynth/src

Files:

• configs/xynth.conf (modified) (1 diff)
• python/Makefile (modified) (1 diff)
• server/video/bochs/server.c (modified) (1 diff)

Whitix/trunk/user/xynth/src/configs/xynth.conf

@@ -7 +7 @@
 ; bochs
 ; vga
-driver = vga
+driver = bochs
 
 ; Mode :

Whitix/trunk/user/xynth/src/python/Makefile

@@ -6 +6 @@
 
 INCDIR += ../lib ../../../python/Include ../../../python ../../../libc/include ../../../librtl ../../../posix/include
-LIBDIR += ../lib ../../../libc ../../../librtl ../../../posix
+LIBDIR += ../lib ../../../libc ../../../librtl ../../../posix ../../../python
 
 OBJS = window.o xynthpy.o

Whitix/trunk/user/xynth/src/server/video/bochs/server.c

@@ -43 +43 @@
         printf("Loading bochs driver\n");
         SysIoAccess(1);
+
+#ifndef SERVER_DISABLE_GRAPHICS
         VbeSetMode(BOCHS_WIDTH, BOCHS_HEIGHT, BOCHS_BPP);
+#endif
 
         server->window->surface->width=BOCHS_WIDTH;