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.

Sign up for GitHub

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

Jump to bottom

Fix Bullet compilation. #1198

Merged
merged 1 commit into from Feb 15, 2015
Merged

Fix Bullet compilation. #1198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion Engine/source/T3D/physics/bullet/bt.h
View file
Open in desktop
Expand Up @@ -24,10 +24,14 @@
#define _BULLET_H_

// NOTE: We set these defines which bullet needs here.
#ifdef TORQUE_OS_WIN
#if defined TORQUE_OS_WIN && !defined(WIN32)
Copy link

Choose a reason for hiding this comment

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

Forgot parenthesis around former defined check as required:

#if defined(TORQUE_OS_WIN) && !defined(WIN32)

#define WIN32
#endif

#ifdef TORQUE_CPU_X86
#define __BT_SKIP_UINT64_H
#endif

// NOTE: All the Bullet includes we use should be here and
// nowhere else.... beware!

Expand Down