pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-Fixed RASPBERRY not being renamed to AMIBERRY on some places

Browse source 
-Updated the project to include a DEBUG pre-launch option, so we don't have to change the Makefile every time
-Updated the Makefile to comment out DEBUG
This commit is contained in:
Dimitris Panokostas 2017-09-28 23:56:40 +02:00
parent ec6e9611ac
commit 9d8dc58b19
7 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -39,7 +39,7 @@ all: guisan $(PROG)
guisan: guisan:
$(MAKE) -C src/guisan $(MAKE) -C src/guisan
DEBUG=1 #DEBUG=1
SDL_CFLAGS = `sdl2-config --cflags --libs` SDL_CFLAGS = `sdl2-config --cflags --libs`

6
VSLinux/Amiberry.vcxproj.user
View file

@ -4,14 +4,12 @@
<RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand> <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory> <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor> <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand> <PreLaunchCommand>export DEBUG=1</PreLaunchCommand>
</PreLaunchCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand> <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory> <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor> <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand> <PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
</PreLaunchCommand>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
src/cfgfile.cpp
View file

@ -4408,7 +4408,7 @@ void default_prefs(struct uae_prefs *p, bool reset, int type)
p->gfx_framerate = 0; p->gfx_framerate = 0;
#ifdef RASPBERRY #ifdef AMIBERRY
p->gfx_size.width = 640; p->gfx_size.width = 640;
p->gfx_size.height = 256; p->gfx_size.height = 256;
p->gfx_resolution = RES_HIRES; p->gfx_resolution = RES_HIRES;

2
src/drawing.cpp
View file

@ -2205,7 +2205,7 @@ static void center_image(void)
linetoscr_x_adjust_pixbytes = linetoscr_x_adjust_pixels * gfxvidinfo.drawbuffer.pixbytes; linetoscr_x_adjust_pixbytes = linetoscr_x_adjust_pixels * gfxvidinfo.drawbuffer.pixbytes;
thisframe_y_adjust_real = minfirstline; thisframe_y_adjust_real = minfirstline;
max_ypos_thisframe = (maxvpos_display - minfirstline); max_ypos_thisframe = maxvpos_display - minfirstline + 1;
} }
static void init_drawing_frame(void) static void init_drawing_frame(void)

2
src/fsdb_unix.cpp
View file

@ -85,7 +85,7 @@ int fsdb_fill_file_attrs (a_inode *base, a_inode *aino)
| (S_IWUSR & statbuf.st_mode ? 0 : A_FIBF_WRITE) | (S_IWUSR & statbuf.st_mode ? 0 : A_FIBF_WRITE)
| (S_IRUSR & statbuf.st_mode ? 0 : A_FIBF_READ)); | (S_IRUSR & statbuf.st_mode ? 0 : A_FIBF_READ));
#if defined(WIN32) || defined(ANDROIDSDL) || defined(RASPBERRY) #if defined(WIN32) || defined(ANDROIDSDL) || defined(AMIBERRY)
// Always give execute & read permission // Always give execute & read permission
// Temporary do this for raspberry... // Temporary do this for raspberry...
aino->amigaos_mode &= ~A_FIBF_EXECUTE; aino->amigaos_mode &= ~A_FIBF_EXECUTE;

73
src/osdep/amiberry_gfx.cpp
View file

@ -226,7 +226,7 @@ int lockscr()
{ {
if(SDL_LockSurface(screen)== -1) if(SDL_LockSurface(screen)== -1)
return 0; return 0;
//init_row_map(); init_row_map();
return 1; return 1;
} }
@ -516,42 +516,41 @@ static int save_thumb(char* path)
bool vsync_switchmode(int hz) bool vsync_switchmode(int hz)
{ {
// int changed_height = changed_prefs.gfx_size.height; int changed_height = changed_prefs.gfx_size.height;
//
// if (hz >= 55) if (hz >= 55)
// hz = 60; hz = 60;
// else else
// hz = 50; hz = 50;
//
// if(hz == 50 && currVSyncRate == 60) // if(hz == 50 && currVSyncRate == 60)
// { // {
// // Switch from NTSC -> PAL // // Switch from NTSC -> PAL
// switch(changed_height) { // switch(changed_height) {
// case 200: changed_height = 240; break; // case 200: changed_height = 240; break;
// case 216: changed_height = 262; break; // case 216: changed_height = 262; break;
// case 240: changed_height = 270; break; // case 240: changed_height = 270; break;
// case 256: changed_height = 270; break; // case 256: changed_height = 270; break;
// case 262: changed_height = 270; break; // case 262: changed_height = 270; break;
// case 270: changed_height = 270; break; // case 270: changed_height = 270; break;
// } // }
// } // }
// else if(hz == 60 && currVSyncRate == 50) // else if(hz == 60 && currVSyncRate == 50)
// { // {
// // Switch from PAL -> NTSC // // Switch from PAL -> NTSC
// switch(changed_height) { // switch(changed_height) {
// case 200: changed_height = 200; break; // case 200: changed_height = 200; break;
// case 216: changed_height = 200; break; // case 216: changed_height = 200; break;
// case 240: changed_height = 200; break; // case 240: changed_height = 200; break;
// case 256: changed_height = 216; break; // case 256: changed_height = 216; break;
// case 262: changed_height = 216; break; // case 262: changed_height = 216; break;
// case 270: changed_height = 240; break; // case 270: changed_height = 240; break;
// } // }
// } // }
// //
// if(changed_height == currprefs.gfx_size.height && hz == currprefs.chipset_refreshrate)
// return true; if (!picasso_on && !picasso_requested_on)
// changed_prefs.gfx_size.height = changed_height;
// changed_prefs.gfx_size.height = changed_height;
return true; return true;
} }

2
src/osdep/picasso96.cpp
View file

@ -67,7 +67,7 @@
#define NOBLITTER_BLIT 0 #define NOBLITTER_BLIT 0
#define NOBLITTER_ALL 0 #define NOBLITTER_ALL 0
#ifdef RASPBERRY #ifdef AMIBERRY
static const int defaultHz = 50; static const int defaultHz = 50;
#else #else
static const int defaultHz = 60; static const int defaultHz = 60;