Skip to content

P
PUAE
Commit 6fb4f152 authored by GnoStiC's avatar GnoStiC
Browse files
Options

puae 2.3.1

parent c64ca435
Expand all Show whitespace changes
Inline Side-by-side
Showing with 498 additions and 83 deletions
bronx_.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# this is the main script to build (and test) PUAE # this is the main script to build (and test) PUAE
# #
......
build_linux_nojit.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
build_linux_qt.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
build_macos_cocoa.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
build_macos_qt.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
build_macos_xcode.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
# #
# #
# #
......
build_pandora_gtk.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN (aka GnoStiC/BRONX) # 2006-2011 Mustafa TUFAN (aka GnoStiC/BRONX)
#
# #
# this is the main script to build (and test) PUAE
# #
base=" --with-sdl --with-sdl-gfx --with-sdl-sound --enable-drvsnd " base=" --with-sdl --with-sdl-gfx --with-sdl-sound --enable-drvsnd "
glgl=" --with-sdl-gl " glgl=" --with-sdl-gl "
......
configure.in
View file @ 6fb4f152
...@@ -6,7 +6,7 @@ dnl Updated and generally mauled 2008-2011 Mustafa Tufan ...@@ -6,7 +6,7 @@ dnl Updated and generally mauled 2008-2011 Mustafa Tufan
dnl dnl
AC_PREREQ(2.55) AC_PREREQ(2.55)
AC_INIT(PUAE, 2.3.1, ,puae) AC_INIT(PUAE, 2.3.1, 'mustafa.tufan@gmail.com', puae)
AC_CONFIG_SRCDIR([bootstrap.sh]) AC_CONFIG_SRCDIR([bootstrap.sh])
AM_CONFIG_HEADER([src/sysconfig.h]) AM_CONFIG_HEADER([src/sysconfig.h])
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
...@@ -55,6 +55,15 @@ dnl AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no) ...@@ -55,6 +55,15 @@ dnl AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no)
AC_CHECK_LIB(ossaudio,_oss_ioctl, HAVE_LIBOSSAUDIO=yes, HAVE_LIBOSSAUDIO=no) AC_CHECK_LIB(ossaudio,_oss_ioctl, HAVE_LIBOSSAUDIO=yes, HAVE_LIBOSSAUDIO=no)
dnl
dnl commit version
dnl
commit=`tail -1 .git/packed-refs | awk '{print $1}'`
if test -z "$commit"; then
commit="not git"
fi
AC_DEFINE_UNQUOTED(PACKAGE_COMMIT, "$commit", [cloned git commit version])
dnl dnl
dnl Prefer Gtk2.x over Gtk1.x if both are available dnl Prefer Gtk2.x over Gtk1.x if both are available
dnl dnl
...@@ -676,6 +685,10 @@ AC_ARG_WITH(sdl-gl, ...@@ -676,6 +685,10 @@ AC_ARG_WITH(sdl-gl,
AS_HELP_STRING([--with-sdl-gl], [Allow GL for 2D acceleration with SDL graphics]), AS_HELP_STRING([--with-sdl-gl], [Allow GL for 2D acceleration with SDL graphics]),
[WANT_SDLGL=$withval], []) [WANT_SDLGL=$withval], [])
AC_ARG_WITH(cocoa-gfx,
AS_HELP_STRING([--with-cocoa-gfx], [Use Cocoa library for graphics]),
[WANT_COCOAGFX=$withval], [])
AC_ARG_WITH(qt, AC_ARG_WITH(qt,
AS_HELP_STRING([--with-qt], [Use QT library for graphics/ui]), AS_HELP_STRING([--with-qt], [Use QT library for graphics/ui]),
[WANT_QT=$withval], []) [WANT_QT=$withval], [])
...@@ -990,6 +1003,15 @@ if [[ "x$WANT_SDL" = "xyes" -o "x$GFX_DEP" = "x" ]]; then ...@@ -990,6 +1003,15 @@ if [[ "x$WANT_SDL" = "xyes" -o "x$GFX_DEP" = "x" ]]; then
fi fi
fi fi
dnl
if [[ "x$WANT_COCOAGFX" = "xyes" ]]; then
GFX_DEP=gfx-cocoa
GFX_NAME=COCOA
GFX_LIBS=""
GFX_CFLAGS=""
GFX_CPPFLAGS=""
GFX_LIBS="-framework OpenGL"
fi
dnl If we got here and we still haven't found a graphics target dnl If we got here and we still haven't found a graphics target
dnl then bail out. dnl then bail out.
...@@ -1957,7 +1979,7 @@ AC_CONFIG_FILES([Makefile ...@@ -1957,7 +1979,7 @@ AC_CONFIG_FILES([Makefile
src/gfx-x11/Makefile src/gfx-x11/Makefile
src/gfx-sdl/Makefile src/gfx-sdl/Makefile
src/gfx-curses/Makefile src/gfx-curses/Makefile
src/gfx-svga/Makefile src/gfx-cocoa/Makefile
src/sd-alsa/Makefile src/sd-alsa/Makefile
src/sd-amigaos/Makefile src/sd-amigaos/Makefile
src/sd-beos/Makefile src/sd-beos/Makefile
......
release_.sh
View file @ 6fb4f152
# P-UAE # P-UAE
# #
# 2010 Mustafa TUFAN # 2006-2011 Mustafa TUFAN
# #
# this script cleans up various files so that we don't push unnecessary files to git.. # this script cleans up various files so that we don't push unnecessary files to git..
# #
...@@ -43,6 +43,7 @@ rm -rf src/gfx-curses/Makefile.in ...@@ -43,6 +43,7 @@ rm -rf src/gfx-curses/Makefile.in
rm -rf src/gfx-sdl/Makefile.in rm -rf src/gfx-sdl/Makefile.in
rm -rf src/gfx-svga/Makefile.in rm -rf src/gfx-svga/Makefile.in
rm -rf src/gfx-x11/Makefile.in rm -rf src/gfx-x11/Makefile.in
rm -rf src/gfx-cocoa/Makefile.in
rm -rf src/gui-beos/Makefile.in rm -rf src/gui-beos/Makefile.in
rm -rf src/gui-cocoa/Makefile.in rm -rf src/gui-cocoa/Makefile.in
rm -rf src/gui-gtk/Makefile.in rm -rf src/gui-gtk/Makefile.in
......
src/Makefile.am
View file @ 6fb4f152
...@@ -27,7 +27,7 @@ SUBDIRS = \ ...@@ -27,7 +27,7 @@ SUBDIRS = \
DIST_SUBDIRS = \ DIST_SUBDIRS = \
md-generic md-68k md-i386-gcc md-ppc md-ppc-gcc md-amd64-gcc \ md-generic md-68k md-i386-gcc md-ppc md-ppc-gcc md-amd64-gcc \
gfx-amigaos gfx-beos gfx-x11 gfx-sdl gfx-curses gfx-svga \ gfx-amigaos gfx-beos gfx-x11 gfx-sdl gfx-curses gfx-svga gfx-cocoa \
sd-none sd-alsa sd-amigaos sd-beos sd-sdl sd-solaris sd-uss \ sd-none sd-alsa sd-amigaos sd-beos sd-sdl sd-solaris sd-uss \
jd-none jd-amigainput jd-amigaos jd-beos jd-linuxold jd-sdl \ jd-none jd-amigainput jd-amigaos jd-beos jd-linuxold jd-sdl \
gui-none gui-beos gui-cocoa gui-gtk gui-muirexx \ gui-none gui-beos gui-cocoa gui-gtk gui-muirexx \
......
src/gfx-sdl/sdlgfx.c
View file @ 6fb4f152
...@@ -2152,12 +2152,12 @@ int getcapslockstate (void) ...@@ -2152,12 +2152,12 @@ int getcapslockstate (void)
{ {
return SDL_GetModState() & KMOD_CAPS; return SDL_GetModState() & KMOD_CAPS;
} }
void setcapslockstate (int state) void setcapslockstate (int state)
{ {
//TODO: //TODO:
} }
/* /*
* Default inputdevice config for SDL mouse * Default inputdevice config for SDL mouse
*/ */
......
src/gui-cocoa/cocoaui.m
View file @ 6fb4f152
...@@ -235,20 +235,27 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -235,20 +235,27 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
[self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Cartridge ROM" action:@selector(selectCartridge:) tag:0]; [self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Cartridge ROM" action:@selector(selectCartridge:) tag:0];
[self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Flash RAM" action:@selector(selectFlashRAM:) tag:0]; [self createMenuItemInMenu:vAmigaMenu withTitle:@"Select Flash RAM" action:@selector(selectFlashRAM:) tag:0];
[vAmigaMenu addItem:[NSMenuItem separatorItem]]; menuItem = [[NSMenuItem alloc] initWithTitle:@"PUAE" action:nil keyEquivalent:@""];
[menuItem setSubmenu:vAmigaMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:1];
[menuItem release];
[vAmigaMenu release];
// DISK MENU START
NSMenu *dskMenu = [[NSMenu alloc] initWithTitle:@"Disk"];
// Add menu items for inserting into floppy drives 1 - 4 // Add menu items for inserting into floppy drives 1 - 4
NSMenu *insertFloppyMenu = [[NSMenu alloc] initWithTitle:@"Insert Floppy"]; NSMenu *insertFloppyMenu = [[NSMenu alloc] initWithTitle:@"Insert Floppy"];
for (driveNumber=0; driveNumber<4; driveNumber++) { for (driveNumber=0; driveNumber<4; driveNumber++) {
[self createMenuItemInMenu:insertFloppyMenu withTitle:[NSString stringWithFormat:@"DF%d...",driveNumber] action:@selector(insertDisk:) tag:driveNumber]; [self createMenuItemInMenu:insertFloppyMenu withTitle:[NSString stringWithFormat:@"DF%d...",driveNumber] action:@selector(insertDisk:) tag:driveNumber];
} }
menuItem = [[NSMenuItem alloc] initWithTitle:@"Insert Floppy" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Insert Floppy" action:nil keyEquivalent:@""];
[menuItem setSubmenu:insertFloppyMenu]; [menuItem setSubmenu:insertFloppyMenu];
[vAmigaMenu addItem:menuItem]; [dskMenu addItem:menuItem];
[menuItem release]; [menuItem release];
[insertFloppyMenu release];
[dskMenu addItem:[NSMenuItem separatorItem]];
// Add menu items for ejecting from floppy drives 1 - 4 // Add menu items for ejecting from floppy drives 1 - 4
NSMenu *ejectFloppyMenu = [[NSMenu alloc] initWithTitle:@"Eject Floppy"]; NSMenu *ejectFloppyMenu = [[NSMenu alloc] initWithTitle:@"Eject Floppy"];
...@@ -259,15 +266,31 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -259,15 +266,31 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
} }
menuItem = [[NSMenuItem alloc] initWithTitle:@"Eject Floppy" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Eject Floppy" action:nil keyEquivalent:@""];
[menuItem setSubmenu:ejectFloppyMenu]; [menuItem setSubmenu:ejectFloppyMenu];
[vAmigaMenu addItem:menuItem]; [dskMenu addItem:menuItem];
[menuItem release]; [menuItem release];
[ejectFloppyMenu release];
menuItem = [[NSMenuItem alloc] initWithTitle:@"PUAE" action:nil keyEquivalent:@""]; [dskMenu addItem:[NSMenuItem separatorItem]];
[menuItem setSubmenu:vAmigaMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:1]; NSMenu *hddMenu = [[NSMenu alloc] initWithTitle:@"Mount HDF"];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Mount HDF" action:nil keyEquivalent:@""];
[menuItem setSubmenu:hddMenu];
[dskMenu addItem:menuItem];
[menuItem release];
NSMenu *vhddMenu = [[NSMenu alloc] initWithTitle:@"Mount Folder as HDD"];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Mount Folder as HDD" action:nil keyEquivalent:@""];
[menuItem setSubmenu:vhddMenu];
[dskMenu addItem:menuItem];
[menuItem release]; [menuItem release];
[vAmigaMenu release];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Disk" action:nil keyEquivalent:@""];
[menuItem setSubmenu:dskMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:2];
[dskMenu release];
[menuItem release];
// DISK MENU END
// MEM MENU START // MEM MENU START
NSMenu *memMenu = [[NSMenu alloc] initWithTitle:@"Memory"]; NSMenu *memMenu = [[NSMenu alloc] initWithTitle:@"Memory"];
...@@ -365,7 +388,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -365,7 +388,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"Memory" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Memory" action:nil keyEquivalent:@""];
[menuItem setSubmenu:memMenu]; [menuItem setSubmenu:memMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:2]; [[NSApp mainMenu] insertItem:menuItem atIndex:3];
[memMenu release]; [memMenu release];
[menuItem release]; [menuItem release];
// MEM MENU END // MEM MENU END
...@@ -465,7 +488,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -465,7 +488,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"System" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"System" action:nil keyEquivalent:@""];
[menuItem setSubmenu:systemMenu]; [menuItem setSubmenu:systemMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:3]; [[NSApp mainMenu] insertItem:menuItem atIndex:4];
[systemMenu release]; [systemMenu release];
[menuItem release]; [menuItem release];
// SYSTEM MENU END // SYSTEM MENU END
...@@ -506,7 +529,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -506,7 +529,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"Sound" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Sound" action:nil keyEquivalent:@""];
[menuItem setSubmenu:soundMenu]; [menuItem setSubmenu:soundMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:4]; [[NSApp mainMenu] insertItem:menuItem atIndex:5];
[soundMenu release]; [soundMenu release];
[menuItem release]; [menuItem release];
// SOUND MENU END // SOUND MENU END
...@@ -559,7 +582,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -559,7 +582,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
menuItem = [[NSMenuItem alloc] initWithTitle:@"Control" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Control" action:nil keyEquivalent:@""];
[menuItem setSubmenu:controlMenu]; [menuItem setSubmenu:controlMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:5]; [[NSApp mainMenu] insertItem:menuItem atIndex:6];
[controlMenu release]; [controlMenu release];
[menuItem release]; [menuItem release];
...@@ -569,7 +592,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull ...@@ -569,7 +592,7 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
[self createMenuItemInMenu:displayMenu withTitle:@"Inhibit" action:@selector(toggleInhibitDisplay:) tag:0]; [self createMenuItemInMenu:displayMenu withTitle:@"Inhibit" action:@selector(toggleInhibitDisplay:) tag:0];
menuItem = [[NSMenuItem alloc] initWithTitle:@"Display" action:nil keyEquivalent:@""]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Display" action:nil keyEquivalent:@""];
[menuItem setSubmenu:displayMenu]; [menuItem setSubmenu:displayMenu];
[[NSApp mainMenu] insertItem:menuItem atIndex:6]; [[NSApp mainMenu] insertItem:menuItem atIndex:7];
[displayMenu release]; [displayMenu release];
[menuItem release]; [menuItem release];
} }
......
src/include/picasso96.h
View file @ 6fb4f152
...@@ -258,7 +258,7 @@ struct CLUTEntry { ...@@ -258,7 +258,7 @@ struct CLUTEntry {
#ifdef TARGET_AMIGAOS #ifdef TARGET_AMIGAOS
#include <graphics/gfx.h> #include <graphics/gfx.h>
#else #else
struct BitMap struct pBitMap
{ {
uae_u16 BytesPerRow; uae_u16 BytesPerRow;
uae_u16 Rows; uae_u16 Rows;
...@@ -363,7 +363,7 @@ struct RenderInfo { ...@@ -363,7 +363,7 @@ struct RenderInfo {
#define PSSO_Pattern_Size 16 #define PSSO_Pattern_Size 16
#define PSSO_Pattern_DrawMode 17 #define PSSO_Pattern_DrawMode 17
#define PSSO_Pattern_sizeof 18 #define PSSO_Pattern_sizeof 18
struct Pattern { struct pPattern {
uae_u8 *Memory; uae_u8 *Memory;
uae_u16 XOffset, YOffset; uae_u16 XOffset, YOffset;
uae_u32 FgPen, BgPen; uae_u32 FgPen, BgPen;
......
src/main.c
View file @ 6fb4f152
...@@ -88,6 +88,7 @@ static void hr (void) ...@@ -88,6 +88,7 @@ static void hr (void)
static void show_version (void) static void show_version (void)
{ {
write_log ("P-UAE %d.%d.%d\n", UAEMAJOR, UAEMINOR, UAESUBREV); write_log ("P-UAE %d.%d.%d\n", UAEMAJOR, UAEMINOR, UAESUBREV);
write_log ("Git Commit: %s\n", PACKAGE_COMMIT);
write_log ("Build date: " __DATE__ " " __TIME__ "\n"); write_log ("Build date: " __DATE__ " " __TIME__ "\n");
} }
......
src/od-macosx/Info.plist
View file @ 6fb4f152
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<string>uaerc</string> <string>uaerc</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>UAE Configuration</string> <string>PUAE Configuration</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>uae</string> <string>uae</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>euae.icns</string> <string>puae.icns</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>PUAE</string> <string>PUAE</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>2.3.1</string> <string>@PACKAGE_COMMIT@</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.3.1</string> <string>2.3.1</string>
</dict> </dict>
......
src/od-macosx/Info.plist.in
View file @ 6fb4f152
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>@PACKAGE_NAME@</string> <string>@PACKAGE_NAME@</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>@PACKAGE_VERSION@</string> <string>@PACKAGE_COMMIT@</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>@VERSION@</string> <string>@VERSION@</string>
</dict> </dict>
......
src/picasso96.c
View file @ 6fb4f152
...@@ -256,7 +256,7 @@ static TCHAR *BuildBinaryString (uae_u8 value) ...@@ -256,7 +256,7 @@ static TCHAR *BuildBinaryString (uae_u8 value)
return binary_byte; return binary_byte;
} }
static void DumpPattern (struct Pattern *patt) static void DumpPattern (struct pPattern *patt)
{ {
uae_u8 *mem; uae_u8 *mem;
int row, col; int row, col;
...@@ -372,7 +372,7 @@ static int CopyRenderInfoStructureA2U (uaecptr amigamemptr, struct RenderInfo *r ...@@ -372,7 +372,7 @@ static int CopyRenderInfoStructureA2U (uaecptr amigamemptr, struct RenderInfo *r
return 0; return 0;
} }
static int CopyPatternStructureA2U (uaecptr amigamemptr, struct Pattern *pattern) static int CopyPatternStructureA2U (uaecptr amigamemptr, struct pPattern *pattern)
{ {
uaecptr memp = get_long (amigamemptr + PSSO_Pattern_Memory); uaecptr memp = get_long (amigamemptr + PSSO_Pattern_Memory);
if (valid_address (memp, PSSO_Pattern_sizeof)) { if (valid_address (memp, PSSO_Pattern_sizeof)) {
...@@ -400,7 +400,7 @@ static void CopyColorIndexMappingA2U (uaecptr amigamemptr, struct ColorIndexMapp ...@@ -400,7 +400,7 @@ static void CopyColorIndexMappingA2U (uaecptr amigamemptr, struct ColorIndexMapp
} }
} }
static int CopyBitMapStructureA2U (uaecptr amigamemptr, struct BitMap *bm) static int CopyBitMapStructureA2U (uaecptr amigamemptr, struct pBitMap *bm)
{ {
int i; int i;
...@@ -2570,7 +2570,7 @@ STATIC_INLINE void PixelWrite (uae_u8 *mem, int bits, uae_u32 fgpen, int Bpp, ua ...@@ -2570,7 +2570,7 @@ STATIC_INLINE void PixelWrite (uae_u8 *mem, int bits, uae_u32 fgpen, int Bpp, ua
* Inputs: * Inputs:
* a0:struct BoardInfo *bi * a0:struct BoardInfo *bi
* a1:struct RenderInfo *ri * a1:struct RenderInfo *ri
* a2:struct Pattern *pattern * a2:struct pPattern *pattern
* d0.w:X * d0.w:X
* d1.w:Y * d1.w:Y
* d2.w:Width * d2.w:Width
...@@ -2598,7 +2598,7 @@ static uae_u32 REGPARAM2 picasso_BlitPattern (TrapContext *ctx) ...@@ -2598,7 +2598,7 @@ static uae_u32 REGPARAM2 picasso_BlitPattern (TrapContext *ctx)
uae_u8 Bpp = GetBytesPerPixel (RGBFmt); uae_u8 Bpp = GetBytesPerPixel (RGBFmt);
int inversion = 0; int inversion = 0;
struct RenderInfo ri; struct RenderInfo ri;
struct Pattern pattern; struct pPattern pattern;
unsigned long rows; unsigned long rows;
uae_u8 *uae_mem; uae_u8 *uae_mem;
int xshift; int xshift;
...@@ -2977,7 +2977,7 @@ void init_hz_p96 (void) ...@@ -2977,7 +2977,7 @@ void init_hz_p96 (void)
} }
/* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */ /* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */
static void PlanarToChunky (struct RenderInfo *ri, struct BitMap *bm, static void PlanarToChunky (struct RenderInfo *ri, struct pBitMap *bm,
unsigned long srcx, unsigned long srcy, unsigned long srcx, unsigned long srcy,
unsigned long dstx, unsigned long dsty, unsigned long dstx, unsigned long dsty,
unsigned long width, unsigned long height, unsigned long width, unsigned long height,
...@@ -3046,7 +3046,7 @@ static void PlanarToChunky (struct RenderInfo *ri, struct BitMap *bm, ...@@ -3046,7 +3046,7 @@ static void PlanarToChunky (struct RenderInfo *ri, struct BitMap *bm,
/* /*
* BlitPlanar2Chunky: * BlitPlanar2Chunky:
* a0: struct BoardInfo *bi * a0: struct BoardInfo *bi
* a1: struct BitMap *bm - source containing planar information and assorted details * a1: struct pBitMap *bm - source containing planar information and assorted details
* a2: struct RenderInfo *ri - dest area and its details * a2: struct RenderInfo *ri - dest area and its details
* d0.w: SrcX * d0.w: SrcX
* d1.w: SrcY * d1.w: SrcY
...@@ -3074,7 +3074,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx) ...@@ -3074,7 +3074,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx)
uae_u8 minterm = m68k_dreg (regs, 6) & 0xFF; uae_u8 minterm = m68k_dreg (regs, 6) & 0xFF;
uae_u8 mask = m68k_dreg (regs, 7) & 0xFF; uae_u8 mask = m68k_dreg (regs, 7) & 0xFF;
struct RenderInfo local_ri; struct RenderInfo local_ri;
struct BitMap local_bm; struct pBitMap local_bm;
uae_u32 result = 0; uae_u32 result = 0;
if (NOBLITTER) if (NOBLITTER)
...@@ -3093,7 +3093,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx) ...@@ -3093,7 +3093,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Chunky (TrapContext *ctx)
} }
/* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */ /* NOTE: Watch for those planeptrs of 0x00000000 and 0xFFFFFFFF for all zero / all one bitmaps !!!! */
static void PlanarToDirect (struct RenderInfo *ri, struct BitMap *bm, static void PlanarToDirect (struct RenderInfo *ri, struct pBitMap *bm,
unsigned long srcx, unsigned long srcy, unsigned long srcx, unsigned long srcy,
unsigned long dstx, unsigned long dsty, unsigned long dstx, unsigned long dsty,
unsigned long width, unsigned long height, uae_u8 mask, struct ColorIndexMapping *cim) unsigned long width, unsigned long height, uae_u8 mask, struct ColorIndexMapping *cim)
...@@ -3179,7 +3179,7 @@ static void PlanarToDirect (struct RenderInfo *ri, struct BitMap *bm, ...@@ -3179,7 +3179,7 @@ static void PlanarToDirect (struct RenderInfo *ri, struct BitMap *bm,
* BlitPlanar2Direct(bi, bm, ri, cim, SrcX, SrcY, DstX, DstY, SizeX, SizeY, MinTerm, Mask); * BlitPlanar2Direct(bi, bm, ri, cim, SrcX, SrcY, DstX, DstY, SizeX, SizeY, MinTerm, Mask);
* Inputs: * Inputs:
* a0:struct BoardInfo *bi * a0:struct BoardInfo *bi
* a1:struct BitMap *bm * a1:struct pBitMap *bm
* a2:struct RenderInfo *ri * a2:struct RenderInfo *ri
* a3:struct ColorIndexMapping *cmi * a3:struct ColorIndexMapping *cmi
* d0.w:SrcX * d0.w:SrcX
...@@ -3213,7 +3213,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Direct (TrapContext *ctx) ...@@ -3213,7 +3213,7 @@ static uae_u32 REGPARAM2 picasso_BlitPlanar2Direct (TrapContext *ctx)
uae_u8 minterm = m68k_dreg (regs, 6); uae_u8 minterm = m68k_dreg (regs, 6);
uae_u8 Mask = m68k_dreg (regs, 7); uae_u8 Mask = m68k_dreg (regs, 7);
struct RenderInfo local_ri; struct RenderInfo local_ri;
struct BitMap local_bm; struct pBitMap local_bm;
struct ColorIndexMapping local_cim; struct ColorIndexMapping local_cim;
uae_u32 result = 0; uae_u32 result = 0;
......
src/sysconfig.h.in
View file @ 6fb4f152
...@@ -294,6 +294,9 @@ ...@@ -294,6 +294,9 @@
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
/* cloned git commit version */
#undef PACKAGE_COMMIT
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#undef PACKAGE_NAME #undef PACKAGE_NAME
......
src/tools/sysconfig.h.in
View file @ 6fb4f152
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment