add more games and fixes

diff --git a/Makefile b/Makefile
index 0a088682d399ae0fb287e04d32178893474f73ae..8bb34a75d75160a0541e78d72db996b8cfe481d4 100755 (executable)
--- 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 809ae4f28c5a6677a1cd02ed0d3549eac480a2f6..8f1f99d1275bdf2a5c1fded4a1312289d5a1a9fd 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 f8cff4927efd95c8312fa01be5865a68f2ca23ad..77024aaef631cba7c38bfe3af24d1a7b42a88641 100644 (file)
--- 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 4cc06751d6a968313dd6906262615b612c7acba3..396a6047988991e7d064febe888be13e4fff301a 100644 (file)
--- 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 c22d96a8f320c73c4116ce560ba9d8031a4764c3..0f5ab8ed580074b48b48dcbeef8dec98312dfc5a 100644 (file)
--- 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 e938161fb06678178bf776dafead4d90ed74da36..524dddd3ad8ac4b57c3852963f773b9604176f00 100644 (file)
--- 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 4fd52de63dad2ceb8a6422f558bf1d4dcb78251f..f8906b96c53059f65e58a028613615588fe89452 100644 (file)
--- 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 3aeaf65ca4903e6680a6b657bf78405399b423e4..e8f834de8c3906c256b36544666a5f85a8cd8476 100644 (file)
--- 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 41616d890e23a2a457eccc6429f6078bf6138702..d21f92387daa9bb5d2f2aa47fd0e2e288bf4d727 100644 (file)
--- 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 0c98455d8187d8783887d6aa549df007280fb8d3..ed10f8215eb9a52db846288ce9d7b4354fcc6d6f 100644 (file)
--- 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 c58bfe132298fd14c30e4db05031c345ee896db0..95cdcbc9e3f526946d800a51ddabd0f5d01fba0c 100644 (file)
--- 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 9e0a13b9f0187f2301755e36d50ab280ae3c35ad..dc4dcae1cb6cdf7edd998e0736dff2b709b74e79 100644 (file)
--- 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 222ffe08563846cfb9c917143f66908521738d5b..bffe38c8610f9e1d62cf1732e14ad8d4b67b8fce 100644 (file)
--- 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 22ae126f0da59dda05eb140f55f0b41daeb73f96..17c75c9acca838eb91360bd5fcd02ebb6948dffc 100644 (file)
--- 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 6d426e9e17eeb0eb2a2308eac113e30707478325..7a0324b0c1cfad6ede435d859f6e4c19a7b0ab07 100644 (file)
--- 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 d83754a94ee80aba3c973a4f75bb4eeaf5f772b7..45eac811e4a001bcb41c273201f16994716fd0b7 100644 (file)
--- 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 2da6bed5539f31697f51db0cd0a72e2991e39e8b..86c4e0d60999653e2717b3402694bc500ae5cbe6 100644 (file)
--- 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 1412cd05b303d9e139ed9315fe64b9075bf7de9b..88cb1b10ec2031fbdf86712c74ba833c2e890972 100644 (file)
--- 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 1cad153ec3f2ec98db1ea92f01e1a35ac47171fb..2b8dc5fd37c6a26365cc626aaf5822af10c2aa11 100644 (file)
--- 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 990434f1faef8fd05f25df0ace2263481e5a7622..a6d6bbffd814a5f29e51bbd498e2d18d79e31d62 100644 (file)
--- 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 e0023971cff04efbefff44cc27142fc3ae822ef2..49e895ae1646091744fb2898b1dfb6a457089b37 100755 (executable)
--- 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 47e16e33b46cd09bc4d96425fb8027ba8a4f1103..f4c6167a3eaed17b41fd7bf645cb6dcf8013f60c 100644 (file)
--- 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 15d382c7d0cd2f78c3bd047a8556fa03aa2c721a..d09942b7827b1aec5735f23f0d84760fc3e341c7 100755 (executable)
--- 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