Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small changes to fix building on OS X. #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

bwoods
Copy link

@bwoods bwoods commented Mar 23, 2015

Tested with:

  • Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
  • gcc version 4.7.2 (Debian 4.7.2-5)

Tested with:

  - Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
  - gcc version 4.7.2 (Debian 4.7.2-5)
@richgel999
Copy link
Owner

Thanks bwoods!

@@ -61,7 +61,7 @@ void lzham_debug_break(void)
{
#if LZHAM_USE_WIN32_API
DebugBreak();
#elif (TARGET_OS_MAC == 1) && (TARGET_IPHONE_SIMULATOR == 0) && (TARGET_OS_IPHONE == 0)
#elif (TARGET_OS_MAC == 1) && (TARGET_IPHONE_SIMULATOR == 0) && (TARGET_OS_IPHONE == 0) && !defined(__clang__)
__asm {int 3}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The inline assembly should probably just be replaced by a call to __builtin_trap. Then the && !defined(__clang__) I added could be removed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants