Skip to content

Commit

Permalink
Merge branch 'fix-android-build-on-linux' of https://github.com/harni…
Browse files Browse the repository at this point in the history
  • Loading branch information
seanzipline committed Jan 6, 2012
2 parents 8e0633e + 5fd6791 commit 20f9282
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/untz/src/native/android/UntzSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ UInt32 AndroidSystemData::getNumOutputChannels()
}


#include <Threading/Threading.h>
#include <threading/Threading.h>
#include <vector>

class PlaybackThread : public RThread
Expand Down
2 changes: 1 addition & 1 deletion android/libmoai/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
# include submodules
#----------------------------------------------------------------#

include box2D/Android.mk
include box2d/Android.mk
include chipmunk/Android.mk
include contrib/Android.mk
include curl/Android.mk
Expand Down

0 comments on commit 20f9282

Please sign in to comment.