From: wittinobi <wittinobi@wittinobi.de>
Date: Tue, 18 Feb 2014 23:04:57 +0000 (+0100)
Subject: add more games and fixes
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=4335de81b8a2caa0b581083a661a8f0c4a3a611e;p=bs-cst-neutrino-hd.git

add more games and fixes
---

diff --git a/Makefile b/Makefile
index 0a08868..8bb34a7 100755
--- a/Makefile
+++ b/Makefile
@@ -198,13 +198,13 @@ applications-all:
 # plugins.mk
 plugins:
 	if [ $(GAMES) = "yes" ]; then \
-		$(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2 $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg; \
+		$(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2 $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg $(D)/yahtzee $(D)/sokoban $(D)/sudoku $(D)/lemm $(D)/solitair $(D)/c64emu; \
 	else \
 		$(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm; \
 	fi
 plugins-all:
 	if [ $(GAMES) = "yes" ]; then \
-		$(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/blockads $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2 $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg; \
+		$(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/blockads $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm $(D)/libfx2 $(D)/snake $(D)/sol $(D)/pac $(D)/tank $(D)/mines $(D)/master $(D)/tetris $(D)/vierg $(D)/yahtzee $(D)/sokoban $(D)/sudoku $(D)/lemm $(D)/solitair $(D)/c64emu; \
 	else \
 		$(MAKE) $(D)/links $(D)/tuxcom $(D)/tuxcal $(D)/tuxmail $(D)/tuxwetter $(D)/blockads $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/logomask $(D)/logoview $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/sdparm; \
 	fi
diff --git a/archive-sources/c64emu/Display_dbox.i b/archive-sources/c64emu/Display_dbox.i
index 809ae4f..8f1f99d 100644
--- a/archive-sources/c64emu/Display_dbox.i
+++ b/archive-sources/c64emu/Display_dbox.i
@@ -11,7 +11,7 @@
 #include <vgamouse.h>
 #include <vgakeyboard.h>
 #endif
-#include <fbemul.h>
+#include "fbemul.h"
 
 #include "C64.h"
 
@@ -417,7 +417,7 @@ C64Display::C64Display(C64 *the_c64) : TheC64(the_c64)
     quit_requested = false;
 }
 
-#include <keyemul.c>
+#include "keyemul.c"
 
 
 C64Display::~C64Display()
diff --git a/archive-sources/c64emu/ROMS/1541.rom b/archive-sources/c64emu/ROMS/1541.rom
new file mode 100644
index 0000000..c3c6a31
Binary files /dev/null and b/archive-sources/c64emu/ROMS/1541.rom differ
diff --git a/archive-sources/c64emu/ROMS/basic.rom b/archive-sources/c64emu/ROMS/basic.rom
new file mode 100644
index 0000000..9e06923
Binary files /dev/null and b/archive-sources/c64emu/ROMS/basic.rom differ
diff --git a/archive-sources/c64emu/ROMS/char.rom b/archive-sources/c64emu/ROMS/char.rom
new file mode 100644
index 0000000..191ac46
Binary files /dev/null and b/archive-sources/c64emu/ROMS/char.rom differ
diff --git a/archive-sources/c64emu/ROMS/kernal.rom b/archive-sources/c64emu/ROMS/kernal.rom
new file mode 100644
index 0000000..0fb99af
Binary files /dev/null and b/archive-sources/c64emu/ROMS/kernal.rom differ
diff --git a/archive-sources/c64emu/fbemul.h b/archive-sources/c64emu/fbemul.h
index f8cff49..77024aa 100644
--- a/archive-sources/c64emu/fbemul.h
+++ b/archive-sources/c64emu/fbemul.h
@@ -1,3 +1,4 @@
+#define __STDC_CONSTANT_MACROS
 
 #ifdef __cplusplus
 extern	"C" {
diff --git a/archive-sources/c64emu/keyemul.c b/archive-sources/c64emu/keyemul.c
index 4cc0675..396a604 100644
--- a/archive-sources/c64emu/keyemul.c
+++ b/archive-sources/c64emu/keyemul.c
@@ -896,7 +896,7 @@ static int			slowdown=0;
 
 #else /* i386 */
 
-#include <dbox/fp.h>
+//#include <dbox/fp.h>
 
 static	int	keyboard_init( void )
 {
diff --git a/archive-sources/c64emu/vga.c b/archive-sources/c64emu/vga.c
index c22d96a..0f5ab8e 100644
--- a/archive-sources/c64emu/vga.c
+++ b/archive-sources/c64emu/vga.c
@@ -3,13 +3,14 @@
 #include <string.h>
 #include <linux/fb.h>
 #include <sys/mman.h>
+#include <sys/ioctl.h>
 
 extern	int	atoi(char* in);
 
 #define XOFF		150
 #define YOFF		130
 
-#include <fbemul.h>
+#include "fbemul.h"
 
 #ifdef i386
 #define fbdevname	"/dev/fb0"
diff --git a/archive-sources/lemm/double.c b/archive-sources/lemm/double.c
index e938161..524dddd 100644
--- a/archive-sources/lemm/double.c
+++ b/archive-sources/lemm/double.c
@@ -7,11 +7,22 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <draw.h>
+#include "draw.h"
 #include <sys/time.h>
-#include <rcinput.h>
-#include <colors.h>
-#include <sprite.h>
+#include "rcinput.h"
+#include "colors.h"
+#include "sprite.h"
+
+#define	RC_0			0
+#define	RC_1			1
+#define	RC_2			2
+#define	RC_3			3
+#define	RC_4			4
+#define	RC_5			5
+#define	RC_6			6
+#define	RC_7			7
+#define	RC_8			8
+#define	RC_9			9
 
 #define max(a,b)	((a)>(b)?(a):(b))
 
diff --git a/archive-sources/lemm/pic.c b/archive-sources/lemm/pic.c
index 4fd52de..f8906b9 100644
--- a/archive-sources/lemm/pic.c
+++ b/archive-sources/lemm/pic.c
@@ -6,15 +6,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <draw.h>
+#include "draw.h"
 #include <sys/time.h>
-#include <rcinput.h>
-#include <colors.h>
+#include "rcinput.h"
+#include "colors.h"
 #include <fcntl.h>
 #include <zlib.h>
 #include <malloc.h>
 
-#include <pics.h>
+#include "pics.h"
 #define	COMPSZ	8033
 
 extern	int		doexit;
diff --git a/archive-sources/lemm/sprite.c b/archive-sources/lemm/sprite.c
index 3aeaf65..e8f834d 100644
--- a/archive-sources/lemm/sprite.c
+++ b/archive-sources/lemm/sprite.c
@@ -8,9 +8,20 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <rcinput.h>
-#include <colors.h>
-#include <sprite.h>
+#include "rcinput.h"
+#include "colors.h"
+#include "sprite.h"
+
+#define	RC_0			0
+#define	RC_1			1
+#define	RC_2			2
+#define	RC_3			3
+#define	RC_4			4
+#define	RC_5			5
+#define	RC_6			6
+#define	RC_7			7
+#define	RC_8			8
+#define	RC_9			9
 
 extern	int		doexit;
 
diff --git a/archive-sources/solitair/Block.cpp b/archive-sources/solitair/Block.cpp
index 41616d8..d21f923 100644
--- a/archive-sources/solitair/Block.cpp
+++ b/archive-sources/solitair/Block.cpp
@@ -2,6 +2,8 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
+
 #include "Block.h"
 extern "C"
 {
diff --git a/archive-sources/solitair/Card.cpp b/archive-sources/solitair/Card.cpp
index 0c98455..ed10f82 100644
--- a/archive-sources/solitair/Card.cpp
+++ b/archive-sources/solitair/Card.cpp
@@ -2,6 +2,8 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
+
 #include "Card.h"
 #include "math.h"
 #include "stdio.h"
diff --git a/archive-sources/solitair/Foundation.cpp b/archive-sources/solitair/Foundation.cpp
index c58bfe1..95cdcbc 100644
--- a/archive-sources/solitair/Foundation.cpp
+++ b/archive-sources/solitair/Foundation.cpp
@@ -2,6 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
 
 #include "Foundation.h"
 extern "C"
diff --git a/archive-sources/solitair/Table.cpp b/archive-sources/solitair/Table.cpp
index 9e0a13b..dc4dcae 100644
--- a/archive-sources/solitair/Table.cpp
+++ b/archive-sources/solitair/Table.cpp
@@ -2,6 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
 
 #include "Table.h"
 
@@ -27,6 +28,17 @@ extern	unsigned short	actcode; //from rcinput
 extern	unsigned short	realcode; //from rcinput
 extern	int				doexit;
 
+#define	RC_0			0
+#define	RC_1			1
+#define	RC_2			2
+#define	RC_3			3
+#define	RC_4			4
+#define	RC_5			5
+#define	RC_6			6
+#define	RC_7			7
+#define	RC_8			8
+#define	RC_9			9
+
 #define T_ROWS		2
 #define T_COLS		9
 
@@ -659,11 +671,11 @@ bool CTable::Setup()
 
 			SomeChanges = true;
 			break;
-		case RC_SETUP :
-			if( FirstRun ) break;
-			RcGetActCode();
-			return false;
-			break;
+//		case RC_SETUP :
+//			if( FirstRun ) break;
+//			RcGetActCode();
+//			return false;
+//			break;
 		}
 
 		if( SomeChanges )
@@ -815,8 +827,8 @@ void CTable::HandleKeysPressed()
 		case RC_OK :
 			this->DoAction();
 			break;
-		case RC_SPKR :
-			break;
+//		case RC_SPKR :
+//			break;
 
 		case RC_STANDBY :
 
@@ -847,21 +859,21 @@ void CTable::HandleKeysPressed()
 			HelpOnScreen = true;
 
 			break;
-		case RC_SETUP :
-			if( this->Setup() )
-				this->Init();
-			FBCopyImage( 0, 0, WIDTH, HEIGHT, BBGetData() );
-			break;
+//		case RC_SETUP :
+//			if( this->Setup() )
+//				this->Init();
+//			FBCopyImage( 0, 0, WIDTH, HEIGHT, BBGetData() );
+//			break;
 		case RC_HOME :
 
 
 			break;
-		case RC_PAGE_DOWN :
-
-			break;
-		case RC_PAGE_UP :
-
-			break;
+//		case RC_PAGE_DOWN :
+//
+//			break;
+//		case RC_PAGE_UP :
+//
+//			break;
 
 		default:
 //
diff --git a/archive-sources/solitair/Tableau.cpp b/archive-sources/solitair/Tableau.cpp
index 222ffe0..bffe38c 100644
--- a/archive-sources/solitair/Tableau.cpp
+++ b/archive-sources/solitair/Tableau.cpp
@@ -2,6 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
 
 #include "Tableau.h"
 #include "Buffer.h"
diff --git a/archive-sources/solitair/Wastepile.cpp b/archive-sources/solitair/Wastepile.cpp
index 22ae126..17c75c9 100644
--- a/archive-sources/solitair/Wastepile.cpp
+++ b/archive-sources/solitair/Wastepile.cpp
@@ -2,6 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
 
 #include "Wastepile.h"
 extern "C"
diff --git a/archive-sources/solitair/pnm_file.cpp b/archive-sources/solitair/pnm_file.cpp
index 6d426e9..7a0324b 100644
--- a/archive-sources/solitair/pnm_file.cpp
+++ b/archive-sources/solitair/pnm_file.cpp
@@ -1,3 +1,5 @@
+#define __STDC_CONSTANT_MACROS
+
 #include "pnm_file.h"
 
 #include <string.h>
diff --git a/archive-sources/solitair/somain.cpp b/archive-sources/solitair/somain.cpp
index d83754a..45eac81 100644
--- a/archive-sources/solitair/somain.cpp
+++ b/archive-sources/solitair/somain.cpp
@@ -2,6 +2,8 @@
 ** initial coding by fx2
 */
 
+#define __STDC_CONSTANT_MACROS
+
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
@@ -14,11 +16,11 @@
 
 extern "C"
 {
-#include <draw.h>
-#include <fx2math.h>
-#include <pig.h>
-#include <plugin.h>
-#include <rcinput.h>
+#include "draw.h"
+#include "fx2math.h"
+#include "pig.h"
+//#include <plugin.h"
+#include "rcinput.h"
 }
 
 #include "pnm_file.h"
@@ -32,16 +34,29 @@ extern	int				doexit;
 extern	unsigned short	actcode;
 extern	unsigned short	realcode;
 
-int solitair_exec( int fdfb, int fdrc, int fdlcd, char *cfgfile )
+#define	RC_0			0
+#define	RC_1			1
+#define	RC_2			2
+#define	RC_3			3
+#define	RC_4			4
+#define	RC_5			5
+#define	RC_6			6
+#define	RC_7			7
+#define	RC_8			8
+#define	RC_9			9
+
+int main( )
 {
 	int 			rc = 0;
 
 	CTable table;
 
+	int fdfb = -1, fdrc = -1;
 	if ( FBInitialize( 720, 576, 8, fdfb ) < 0 )
 		return -1;
 
 	Set_8Bit_Pal();
+	FBFillRect( 0, 0, 1400, 800, BNR0 );
 
 	if ( RcInitialize( fdrc ) < 0 )
 		return -1;
@@ -55,24 +70,24 @@ int solitair_exec( int fdfb, int fdrc, int fdlcd, char *cfgfile )
 	return rc;
 }
 
-extern "C"
-{
-	int plugin_exec( PluginParam *par )
-	{
-		int		fd_fb=-1;
-		int		fd_rc=-1;
-
-		for( ; par; par=par->next )
-		{
-			if ( !strcmp(par->id,P_ID_FBUFFER) )
-				fd_fb=_atoi(par->val);
-			else if ( !strcmp(par->id,P_ID_RCINPUT) )
-				fd_rc=_atoi(par->val);
-			else if ( !strcmp(par->id,P_ID_NOPIG) )
-				fx2_use_pig=!_atoi(par->val);
-		}
-
-		return solitair_exec( fd_fb, fd_rc, -1, 0 );
-	}
-}
+//extern "C"
+//{
+//	int plugin_exec( PluginParam *par )
+//	{
+//		int		fd_fb=-1;
+//		int		fd_rc=-1;
+//
+//		for( ; par; par=par->next )
+//		{
+//			if ( !strcmp(par->id,P_ID_FBUFFER) )
+//				fd_fb=_atoi(par->val);
+//			else if ( !strcmp(par->id,P_ID_RCINPUT) )
+//				fd_rc=_atoi(par->val);
+//			else if ( !strcmp(par->id,P_ID_NOPIG) )
+//				fx2_use_pig=!_atoi(par->val);
+//		}
+//
+//		return solitair_exec( fd_fb, fd_rc, -1, 0 );
+//	}
+//}
 
diff --git a/archive-sources/sudoku/board.cpp b/archive-sources/sudoku/board.cpp
index 2da6bed..86c4e0d 100644
--- a/archive-sources/sudoku/board.cpp
+++ b/archive-sources/sudoku/board.cpp
@@ -19,6 +19,8 @@
 	If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define __STDC_CONSTANT_MACROS
+
 #include "board.h"
 
 #include <fstream>
@@ -563,7 +565,7 @@ void CBoard::MoveCursor(void)
 //		case RC_RED:
 //		case RC_YELLOW:
 //		case RC_GREEN:
-		case RC_SETUP:
+//		case RC_SETUP:
 		case RC_BLUE:
 			m_bShowMenu = false;
 			DrawBoard(DRAWBOARD_SHOW_DEFAULT);
@@ -657,7 +659,7 @@ void CBoard::MoveCursor(void)
 //		case RC_RED:
 //		case RC_YELLOW:
 //		case RC_GREEN:
-		case RC_SETUP:
+//		case RC_SETUP:
 		case RC_BLUE:
 			m_bShowMenu = true;
 			MenuDraw(&m_Menu);
diff --git a/archive-sources/sudoku/menu.cpp b/archive-sources/sudoku/menu.cpp
index 1412cd0..88cb1b1 100644
--- a/archive-sources/sudoku/menu.cpp
+++ b/archive-sources/sudoku/menu.cpp
@@ -19,6 +19,8 @@
 	If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define __STDC_CONSTANT_MACROS
+
 #include "menu.h"
 
 #include <cstdio>
@@ -28,7 +30,7 @@
 #ifndef TEST
 extern "C"
 {
-	#include <draw.h>
+	#include "draw.h"
 }
 #else
 	#define RED	0
@@ -46,6 +48,16 @@ extern "C"
 
 #define FORMAT_TMP_LEN									1024
 
+#define	RC_0			0
+#define	RC_1			1
+#define	RC_2			2
+#define	RC_3			3
+#define	RC_4			4
+#define	RC_5			5
+#define	RC_6			6
+#define	RC_7			7
+#define	RC_8			8
+#define	RC_9			9
 
 // ----------------------------------------------------------------------------
 // tMenuItem::tMenuItem()
diff --git a/archive-sources/sudoku/somain.cpp b/archive-sources/sudoku/somain.cpp
index 1cad153..2b8dc5f 100644
--- a/archive-sources/sudoku/somain.cpp
+++ b/archive-sources/sudoku/somain.cpp
@@ -19,6 +19,8 @@
 	If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define __STDC_CONSTANT_MACROS
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/archive-sources/sudoku/sudoku.cpp b/archive-sources/sudoku/sudoku.cpp
index 990434f..a6d6bbf 100644
--- a/archive-sources/sudoku/sudoku.cpp
+++ b/archive-sources/sudoku/sudoku.cpp
@@ -28,6 +28,16 @@
 
 //#define _DEBUG_
 
+#define	RC_0			0
+#define	RC_1			1
+#define	RC_2			2
+#define	RC_3			3
+#define	RC_4			4
+#define	RC_5			5
+#define	RC_6			6
+#define	RC_7			7
+#define	RC_8			8
+#define	RC_9			9
 
 #ifdef HAVE_DBOX_HARDWARE
 	#include "misc.h"
diff --git a/make/libraries.mk b/make/libraries.mk
index e002397..49e895a 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -177,6 +177,7 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-1.3.0.tar.gz | $(TARGETPREFIX)
 		$(MAKE) install DESTDIR=$(TARGETPREFIX)
 	$(REWRITE_LIBTOOL)/libjpeg.la
 	rm -rf $(TARGETPREFIX)/man &&\
+	rm -rf $(TARGETPREFIX)/share/doc &&\
 	$(REMOVE)/libjpeg-turbo-1.3.0
 	touch $@
 
diff --git a/make/plugins.mk b/make/plugins.mk
index 47e16e3..f4c6167 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -378,7 +378,6 @@ $(D)/vierg: $(D)/libfx2
 	rm -rf $(BUILD_TMP)/vierg
 	touch $@
 
-#broken
 $(D)/yahtzee: $(D)/libfx2
 	mkdir -p $(LIBPLUG) && \
 	cp -a $(SOURCE)/yahtzee $(BUILD_TMP)/ && \
@@ -389,58 +388,57 @@ $(D)/yahtzee: $(D)/libfx2
 	rm -rf $(BUILD_TMP)/yahtzee
 	touch $@
 
-#broken
 $(D)/sokoban: $(D)/libfx2
 	mkdir -p $(LIBPLUG) && \
+	mkdir -p $(TARGETPREFIX)//var/tuxbox/config/sokoban && \
 	cp -a $(SOURCE)/sokoban $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/sokoban && \
 		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sokoban/soko.so board.c somain.c
 	cp -f $(BUILD_TMP)/sokoban/soko.so $(LIBPLUG)/
 	cp -f $(BUILD_TMP)/sokoban/soko.cfg $(LIBPLUG)/
+	cp -f $(BUILD_TMP)/sokoban/*.xsb $(TARGETPREFIX)//var/tuxbox/config/sokoban/
 	rm -rf $(BUILD_TMP)/sokoban
 	touch $@
 
-#broken
 $(D)/sudoku: $(D)/libfx2
 	mkdir -p $(LIBPLUG) && \
 	cp -a $(SOURCE)/sudoku $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/sudoku && \
-		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sudoku/sudoku.so board.cpp menu.cpp misc.cpp somain.cpp sudoku.cpp
+		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sudoku/sudoku.so misc.cpp menu.cpp sudoku.cpp board.cpp somain.cpp
 	cp -f $(BUILD_TMP)/sudoku/sudoku.so $(LIBPLUG)/
 	cp -f $(BUILD_TMP)/sudoku/sudoku.cfg $(LIBPLUG)/
 	rm -rf $(BUILD_TMP)/sudoku
 	touch $@
 
-#broken
 $(D)/lemm: $(D)/libfx2
 	mkdir -p $(LIBPLUG) && \
 	cp -a $(SOURCE)/lemm $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/lemm && \
-		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/lemm/lemmings.so lemm.c double.c pic.c sound.c sprite.c somain.c
+		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -lpthread -o $(BUILD_TMP)/lemm/lemmings.so somain.c sprite.c lemm.c pic.c sound.c double.c
 	cp -f $(BUILD_TMP)/lemm/lemmings.so $(LIBPLUG)/
 	cp -f $(BUILD_TMP)/lemm/lemmings.cfg $(LIBPLUG)/
 	rm -rf $(BUILD_TMP)/lemm
 	touch $@
 
-#broken
 $(D)/solitair: $(D)/libfx2
 	mkdir -p $(LIBPLUG) && \
 	cp -a $(SOURCE)/solitair $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/solitair && \
-		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/solitair/solitair.so backbuffer.cpp Block.cpp Buffer.cpp Card.cpp Foundation.cpp Hand.cpp pnm_file.cpp pnm_res.cpp rle.cpp Slot.cpp Table.cpp Tableau.cpp Wastepile.cpp somain.cpp
+		$(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -lm -o $(BUILD_TMP)/solitair/solitair.so Block.cpp Buffer.cpp Card.cpp Foundation.cpp Hand.cpp Slot.cpp Table.cpp Tableau.cpp Wastepile.cpp somain.cpp pnm_file.cpp pnm_res.cpp backbuffer.cpp
 	cp -f $(BUILD_TMP)/solitair/solitair.so $(LIBPLUG)/
 	cp -f $(BUILD_TMP)/solitair/solitair.cfg $(LIBPLUG)/
 	rm -rf $(BUILD_TMP)/solitair
 	touch $@
 
-#broken
 $(D)/c64emu: $(D)/libfx2
 	mkdir -p $(LIBPLUG) && \
 	cp -a $(SOURCE)/c64emu $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/c64emu && \
-		$(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/c64emu/c64emu.so 1541d64.cpp 1541job.cpp C64.cpp VIC.cpp CmdPipe.cpp CPUC64.cpp SID.cpp 1541fs.cpp 1541t64.cpp main.cpp CIA.cpp CPU1541.cpp CPU_common.cpp Display.cpp Prefs.cpp REU.cpp SAM.cpp vga.c
+		$(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -lm -o $(BUILD_TMP)/c64emu/c64emu.so main.cpp Display.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp 1541d64.cpp 1541t64.cpp 1541job.cpp SAM.cpp CmdPipe.cpp C64.cpp CPUC64.cpp VIC.cpp CIA.cpp CPU1541.cpp vga.c
+	mkdir -p $(LIBPLUG)/c64emu && \
 	cp -f $(BUILD_TMP)/c64emu/c64emu.so $(LIBPLUG)/
 	cp -f $(BUILD_TMP)/c64emu/c64emu.cfg $(LIBPLUG)/
+	cp -f $(BUILD_TMP)/c64emu/ROMS/* $(LIBPLUG)/c64emu/
 	rm -rf $(BUILD_TMP)/c64emu
 	touch $@
 
diff --git a/skel-root/etc/init.d/start_neutrino b/skel-root/etc/init.d/start_neutrino
index 15d382c..d09942b 100755
--- a/skel-root/etc/init.d/start_neutrino
+++ b/skel-root/etc/init.d/start_neutrino
@@ -3,13 +3,13 @@ export PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 if [ -e /var/etc/.noblink ]; then
 	if [ -e /var/etc/.neutrino_debug ]; then
-		/bin/neutrino --noblink -u 3 > /dev/console 2> /dev/console
+		/bin/neutrino --noblink -u > /dev/console 2> /dev/console
 	else
 		/bin/neutrino --noblink -u -v 3 > /dev/null 2> /dev/null
 	fi
 else
 	if [ -e /var/etc/.neutrino_debug ]; then
-		/bin/neutrino -u 3 > /dev/console 2> /dev/console
+		/bin/neutrino -u > /dev/console 2> /dev/console
 	else
 		/bin/neutrino -u -v 3 > /dev/null 2> /dev/null
 	fi