Macintosh-HW/SCSI2SD
1
0
Fork 0
mirror of https://github.com/fhgwright/SCSI2SD.git synced 2024-06-02 06:41:36 +00:00
Code Issues Projects Releases Wiki Activity

fix issues with compilation on mac

Browse Source
This commit is contained in:
Gregory John Casamento 2019-08-12 01:01:35 -04:00
parent b6cd1a0459
commit 935f5dc7b9
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
software/scsi2sd-util/Makefile
View File

@ -63,8 +63,8 @@ ifeq ($(TARGET),Win64)
VPATH += hidapi-windows
LDFLAGS += -static -mconsole -mwindows -lsetupapi
BUILD := $(PWD)/build/windows/64bit
CC=x86_64-w64-mingw32-gcc
CXX=x86_64-w64-mingw32-g++
CC=gcc
CXX=g++
LIBZIPPER_CONFIG+=--host=x86_64-w64-mingw32
EXE=.exe
WX_CONFIG+=--host=x86_64-w64-mingw32
@ -79,8 +79,8 @@ ifeq ($(TARGET),Darwin)
# Should match OSX
VPATH += hidapi-mac
LDFLAGS += -framework IOKit -framework CoreFoundation -lexpat
CC=clang -mmacosx-version-min=10.7
CXX=clang++ -stdlib=libc++ -mmacosx-version-min=10.7
CC=gcc -mmacosx-version-min=10.7
CXX=g++ -stdlib=libc++ -mmacosx-version-min=10.7
WX_CONFIG += --with-macosx-version-min=10.7
BUILD := $(PWD)/build/mac
all: $(BUILD)/scsi2sd-util.dmg

3
software/scsi2sd-util/wxWidgets/src/osx/carbon/icon.cpp
View File

@ -279,7 +279,8 @@ bool wxIcon::LoadIconFromSystemResource(const wxString& resourceName, int desire
if ( theId != 0 )
{
IconRef iconRef = NULL ;
verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
//verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ;
if ( iconRef )
{
m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;

15
software/scsi2sd-util/wxWidgets/src/osx/carbon/region.cpp
View File

@ -1021,7 +1021,8 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
AllocExclusive();
verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;
// verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;
HIShapeOffset( M_REGION , x , y );
return true ;
}
@ -1076,11 +1077,13 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
switch (op)
{
case wxRGN_AND:
verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
// verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION );
break ;
case wxRGN_OR:
verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
// verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION );
break ;
case wxRGN_XOR:
@ -1088,12 +1091,14 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
// XOR is defined as the difference between union and intersection
wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) );
wxCFRef< HIShapeRef > intersectionshape( HIShapeCreateIntersection( M_REGION , OTHER_M_REGION(region) ) );
verify_noerr( HIShapeDifference( unionshape, intersectionshape, M_REGION ) );
// verify_noerr( HIShapeDifference( unionshape, intersectionshape, M_REGION ) );
HIShapeDifference( unionshape, intersectionshape, M_REGION );
}
break ;
case wxRGN_DIFF:
verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ;
// verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ;
HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION );
break ;
case wxRGN_COPY:

3
software/scsi2sd-util/wxWidgets/src/osx/core/bitmap.cpp
View File

@ -1064,7 +1064,8 @@ IconRef wxBitmap::GetIconRef() const
IconRef wxBitmap::CreateIconRef() const
{
IconRef icon = GetIconRef();
verify_noerr( AcquireIconRef(icon) );
// verify_noerr( AcquireIconRef(icon) );
AcquireIconRef(icon);
return icon;
}
#endif

3
software/scsi2sd-util/wxWidgets/src/osx/core/utilsexc_base.cpp
View File

@ -62,7 +62,8 @@ long UMAGetSystemVersion()
static SInt32 sUMASystemVersion = 0 ;
if ( sUMASystemVersion == 0 )
{
verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
// verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
Gestalt(gestaltSystemVersion, &sUMASystemVersion);
}
return sUMASystemVersion ;
}