libretro/PUAE
1
0
Fork 0
mirror of https://github.com/libretro/PUAE.git synced 2024-11-23 15:59:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fork patches

Browse Source
This commit is contained in:
mtufan 2011-05-23 12:15:56 +03:00
parent 850759c4ed
commit 4060e64003
20 changed files with 106 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -685,6 +685,9 @@ AC_ARG_WITH(sdl-gfx,
AC_ARG_WITH(sdl-gl,
AS_HELP_STRING([--with-sdl-gl], [Allow GL for 2D acceleration with SDL graphics]),
[WANT_SDLGL=$withval], [])
AC_ARG_WITH(sdl-gui,
AS_HELP_STRING([--with-sdl-gui], [Use SDL for GUI]),
[WANT_SDL_UI=$withval], [])
AC_ARG_WITH(cocoa-gfx,
AS_HELP_STRING([--with-cocoa-gfx], [Use Cocoa library for graphics]),
@ -1322,7 +1325,7 @@ fi
dnl
dnl Do we want Autoconfig?
dnl
AC_MSG_CHECKING([whether to build support for Autconfig devices])
AC_MSG_CHECKING([whether to build support for Autoconfig devices])
if [[ "x$WANT_AUTOCONFIG" != "xno" ]]; then
UAE_DEFINES="$UAE_DEFINES -DAUTOCONFIG"
@ -2012,6 +2015,7 @@ AM_CONDITIONAL(TARGET_WIN32, test x$OSDEP = xod-win32)
AM_CONDITIONAL(TARGET_LINUX, test x$OSDEP = xod-linux)
AM_CONDITIONAL(BUILD_MACOSX_BUNDLE, test x$OSDEP = xod-macosx)
AM_CONDITIONAL(IS_QT, test x$WANT_QT = xyes)
AM_CONDITIONAL(SDL_UI, test x$WANT_SDL_UI = xyes)
AC_SUBST(UAE_CFLAGS)
AC_SUBST(UAE_CPPFLAGS)

14
release_.sh
View File

@ -111,6 +111,20 @@ rm -rf src/compemu.cpp
rm -rf src/compstbl.h
rm -rf src/compstbl.cpp
rm -rf src/md-fpp.h
rm -rf src/target.h
# tools
rm -rf src/tools/blitops.c
rm -rf src/tools/build68k.c
rm -rf src/tools/genblitter.c
rm -rf src/tools/gencomp.c
rm -rf src/tools/gencpu.c
rm -rf src/tools/genlinetoscr.c
rm -rf src/tools/missing.c
rm -rf src/tools/readcpu.c
rm -rf src/tools/writelog.c
echo "=================================================="
echo "Current Commit: "
tail -1 .git/packed-refs | awk '{print $1}'

12
src/Makefile.am
View File

@ -73,18 +73,28 @@ endif
uae$(EXEEXT): $(uae_OBJECTS) $(uae_DEPENDENCIES)
@rm -f uae$(EXEEXT)
$(LINK) $(uae_LDFLAGS) $(uae_OBJECTS) $(uae_LDADD) $(LIBS)
if TARGET_BEOS
xres -o $@ @UAE_RSRCFILE@
mimeset -f $@
endif
if BUILD_MACOSX_BUNDLE
rm -fr $(bundle)
all-local: $(bundle)
$(bundle): uae$(EXEEXT) od-macosx/Info.plist $(srcdir)/od-macosx/puae.icns $(srcdir)/od-macosx/Credits.rtf
rm -rf $(bundle)
mkdir -p $(bundle_contents)/MacOS
mkdir -p $(bundle_contents)/Resources
mkdir -p $(bundle_contents)/Frameworks
$(INSTALL_DATA) od-macosx/Info.plist $(bundle_contents)
$(INSTALL_PROGRAM) uae$(EXEEXT) $(bundle_contents)/MacOS/
cp -R /Library/Frameworks/SDL.framework $(bundle_contents)/Frameworks
if SDL_UI
cp -R /Library/Frameworks/SDL_image.framework $(bundle_contents)/Frameworks
cp -R /Library/Frameworks/SDL_ttf.framework $(bundle_contents)/Frameworks
cp -R $(srcdir)/gui-sdl/fonts $(bundle_contents)/MacOS
cp -R $(srcdir)/gui-sdl/images $(bundle_contents)/MacOS
endif
$(INSTALL_DATA) $(srcdir)/od-macosx/puae.icns $(bundle_contents)/Resources/
$(INSTALL_DATA) $(srcdir)/od-macosx/Credits.rtf $(bundle_contents)/Resources/
endif

48
src/bsdsocket-posix-new.c
View File

@ -1,27 +1,27 @@
/*
* UAE - The Un*x Amiga Emulator
*
* bsdsocket.library emulation - Unix
*
* Copyright 2000-2001 Carl Drougge <carl.drougge@home.se> <bearded@longhaired.org>
* Copyright 2003-2005 Richard Drummond
* Copyright 2004 Jeff Shepherd
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
* UAE - The Un*x Amiga Emulator
*
* bsdsocket.library emulation - Unix
*
* Copyright 2000-2001 Carl Drougge <carl.drougge@home.se> <bearded@longhaired.org>
* Copyright 2003-2005 Richard Drummond
* Copyright 2004 Jeff Shepherd
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include "sysconfig.h"
#include "sysdeps.h"
@ -1393,7 +1393,7 @@ int host_sbinit (TrapContext *context, SB)
sb->hostentsize = 1024;
/* @@@ The thread should be PTHREAD_CREATE_DETACHED */
if (uae_start_thread ("bsdsocket", bsdlib_threadfunc, (void *)sb, &sb->thread)) {
if (uae_start_thread ("bsdsocket", bsdlib_threadfunc, (void *)sb, &sb->thread) == BAD_THREAD) {
write_log ("BSDSOCK: Failed to create thread.\n");
uae_sem_destroy (&sb->sem);
close (sb->sockabort[0]);

2
src/bsdsocket.c
View File

@ -1378,7 +1378,7 @@ void bsdlib_reset (void)
SockLibBase = 0;
write_log ("BSDSOCK: cleanup start..\n");
host_sbcleanup (NULL);
//host_sbcleanup (NULL);
for (sb = socketbases; sb; sb = nsb) {
nsb = sb->next;

10
src/cfgfile.c
View File

@ -933,6 +933,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
: p->keyboard_lang == KBD_LANG_SE ? "se"
: p->keyboard_lang == KBD_LANG_FR ? "fr"
: p->keyboard_lang == KBD_LANG_IT ? "it"
: p->keyboard_lang == KBD_LANG_FI ? "fi"
: p->keyboard_lang == KBD_LANG_TR ? "tr"
: "FOO"));
@ -1699,8 +1700,9 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
|| (l = KBD_LANG_SE, strcasecmp (value, "se") == 0)
|| (l = KBD_LANG_US, strcasecmp (value, "us") == 0)
|| (l = KBD_LANG_FR, strcasecmp (value, "fr") == 0)
|| (l = KBD_LANG_IT, strcasecmp (value, "it") == 0)
|| (l = KBD_LANG_ES, strcasecmp (value, "es") == 0)
|| (l = KBD_LANG_IT, strcasecmp (value, "it") == 0)
|| (l = KBD_LANG_FI, strcasecmp (value, "fi") == 0)
|| (l = KBD_LANG_TR, strcasecmp (value, "tr") == 0))
p->keyboard_lang = l;
else
@ -3108,10 +3110,12 @@ int parse_cmdline_option (struct uae_prefs *p, TCHAR c, const TCHAR *arg)
p->keyboard_lang = KBD_LANG_SE;
else if (0 == strcasecmp(arg, "fr"))
p->keyboard_lang = KBD_LANG_FR;
else if (0 == strcasecmp(arg, "it"))
p->keyboard_lang = KBD_LANG_IT;
else if (0 == strcasecmp(arg, "es"))
p->keyboard_lang = KBD_LANG_ES;
else if (0 == strcasecmp(arg, "it"))
p->keyboard_lang = KBD_LANG_IT;
else if (0 == strcasecmp(arg, "fi"))
p->keyboard_lang = KBD_LANG_FI;
else if (0 == strcasecmp(arg, "tr"))
p->keyboard_lang = KBD_LANG_TR;
break;

41
src/gfx-sdl/sdlkeys_dik.c
View File

@ -340,6 +340,45 @@ static int decode_dik_es (int key) {
}
}
/*
* Handle keys specific to FI keymaps.
*/
static int decode_dik_fi (int key) {
switch (key) {
case SDLK_a: return AK_A;
case SDLK_m: return AK_M;
case SDLK_q: return AK_Q;
case SDLK_w: return AK_W;
case SDLK_y: return AK_Y;
case SDLK_z: return AK_Z;
case SDLK_WORLD_0: return AK_LBRACKET;
case SDLK_WORLD_1: return AK_QUOTE;
case SDLK_WORLD_2: return AK_LBRACKET;
case SDLK_WORLD_3: return AK_LBRACKET;
case SDLK_WORLD_4: return AK_LBRACKET;
case SDLK_WORLD_5: return AK_LBRACKET;
case SDLK_WORLD_86: return AK_SEMICOLON;
case SDLK_WORLD_68: return AK_QUOTE;
case SDLK_WORLD_69: return AK_LBRACKET;
case SDLK_COMMA: return AK_COMMA;
case SDLK_PERIOD: return AK_PERIOD;
case SDLK_MINUS: return AK_SLASH;
case SDLK_LESS:
case SDLK_GREATER: return AK_LTGT;
case SDLK_PLUS:
case SDLK_QUESTION: return AK_EQUAL;
case SDLK_AT:
case SDLK_WORLD_29: return AK_BACKQUOTE;
case SDLK_CARET: return AK_RBRACKET;
case SDLK_BACKSLASH: return AK_MINUS;
case SDLK_HASH: return AK_NUMBERSIGN;
default: return -1;
}
}
/*
* Handle keys specific to TR keymaps.
*/
@ -391,6 +430,8 @@ int sdlk2dik (int key) {
amiga_keycode = decode_dik_it (key); break;
case KBD_LANG_ES:
amiga_keycode = decode_dik_es (key); break;
case KBD_LANG_FI:
amiga_keycode = decode_dik_fi (key); break;
case KBD_LANG_TR:
amiga_keycode = decode_dik_tr (key); break;
}

2
src/include/options.h
View File

@ -11,7 +11,7 @@
#define UAEMINOR 3
#define UAESUBREV 2
typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES, KBD_LANG_TR } KbdLang;
typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES, KBD_LANG_FI, KBD_LANG_TR } KbdLang;
struct uaedev_mount_info;

1
src/md-fpp.h
View File

@ -1 +0,0 @@
.././src/include/fpp-ieee.h

4
src/od-generic/memory.c
View File

@ -506,8 +506,8 @@ void *my_shmat (int shmid, void *shmaddr, int shmflg)
shmids[shmid].natmembase = natmem_offset;
write_log ("SHMAddr %s %p = %p - %p\n", shmids[shmid].name, (uae_u8*)shmaddr-natmem_offset, shmaddr, natmem_offset);
//here
if (shmaddr)
free (shmaddr);
if (shmids[shmid].attached != NULL)
free (shmids[shmid].attached);
result = valloc (/*shmaddr,*/ size);
if (result == NULL) {
result = (void*)-1;

1
src/target.h
View File

@ -1 +0,0 @@
.././src/targets/t-unix.h

1
src/tools/blitops.c
View File

@ -1 +0,0 @@
./../blitops.c

1
src/tools/build68k.c
View File

@ -1 +0,0 @@
./../build68k.c

1
src/tools/genblitter.c
View File

@ -1 +0,0 @@
./../genblitter.c

1
src/tools/gencomp.c
View File

@ -1 +0,0 @@
./../gencomp.c

1
src/tools/gencpu.c
View File

@ -1 +0,0 @@
./../gencpu.c

1
src/tools/genlinetoscr.c
View File

@ -1 +0,0 @@
./../genlinetoscr.c

1
src/tools/missing.c
View File

@ -1 +0,0 @@
./../missing.c

1
src/tools/readcpu.c
View File

@ -1 +0,0 @@
./../readcpu.c

1
src/tools/writelog.c
View File

@ -1 +0,0 @@
./../writelog.c