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

Merge remote-tracking branch 'origin/sdl2' into sdl2

Browse source
This commit is contained in:
Dimitris Panokostas 2017-03-30 21:24:51 +02:00
commit 40d1587588
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/guisan/Makefile
View file

@ -6,7 +6,7 @@ DIRS =$(shell find ./src -maxdepth 3 -type d)
SOURCE = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.cpp))
OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SOURCE)))
INCLUDE =-I./include
INCLUDE =-I./include `sdl2-config --cflags`
CFLAGS = -g -w -O3 $(INCLUDE)
CXXFLAGS= $(CFLAGS)

12
src/hardfile.cpp
View file

@ -573,12 +573,12 @@ void hdf_close(struct hardfiledata *hfd)
hfd->vhd_sectormap = NULL;
}
int hdf_dup(struct hardfiledata *dhfd, const struct hardfiledata *shfd)
{
return hdf_dup_target(dhfd, shfd);
}
//int hdf_dup(struct hardfiledata *dhfd, const struct hardfiledata *shfd)
//{
// return hdf_dup_target(dhfd, shfd);
//}
extern int get_guid_target(uae_u8 *out);
//extern int get_guid_target(uae_u8 *out);
static uae_u64 vhd_read(struct hardfiledata *hfd, void *v, uae_u64 offset, uae_u64 len)
{
@ -795,7 +795,7 @@ int vhd_create(const TCHAR *name, uae_u64 size, uae_u32 dostype)
b[0x3b] = tracksec;
// disk type
b[0x3c + 3] = HFD_VHD_DYNAMIC;
get_guid_target(b + 0x44);
//get_guid_target(b + 0x44);
crc = vhd_checksum(b, -1);
b[0x40] = crc >> 24;
b[0x41] = crc >> 16;