diff options
| author | Ray <raysan5@gmail.com> | 2016-02-21 02:30:28 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2016-02-21 02:30:28 +0100 |
| commit | 2d1b2efb92725d6cf4a8b4f0660c739382d01f39 (patch) | |
| tree | 6b42c14cd9fa22e53e67ff53ce133aaadc3de987 /src | |
| parent | 4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf (diff) | |
| parent | 9ec47768121766cf12fef5d1bab8c8302cdac3a6 (diff) | |
| download | raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.tar.gz raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.zip | |
Merge pull request #84 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/gestures.c | 2 | ||||
| -rw-r--r-- | src/libraylib.bc | bin | 0 -> 603552 bytes | |||
| -rw-r--r-- | src/makefile | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/gestures.c b/src/gestures.c index 9028f43b..3638f23e 100644 --- a/src/gestures.c +++ b/src/gestures.c @@ -184,7 +184,7 @@ void ProcessGestureEvent(GestureEvent event) } else if (event.touchAction == TOUCH_MOVE) { - if ((currentGesture == GESTURE_DRAG)) eventTime = GetCurrentTime(); + if (currentGesture == GESTURE_DRAG) eventTime = GetCurrentTime(); if (!startMoving) { diff --git a/src/libraylib.bc b/src/libraylib.bc Binary files differnew file mode 100644 index 00000000..21039250 --- /dev/null +++ b/src/libraylib.bc diff --git a/src/makefile b/src/makefile index 2d73e646..cab2ced0 100644 --- a/src/makefile +++ b/src/makefile @@ -94,7 +94,7 @@ endif ifeq ($(PLATFORM),PLATFORM_DESKTOP) OBJS = core.o rlgl.o glad.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o else - #GLAD only required on desktop platform + #GLAD only required on desktop platform OBJS = core.o rlgl.o shapes.o text.o textures.o models.o audio.o stb_vorbis.o utils.o camera.o gestures.o endif |