Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2005-01-24 19:16:50 +0300
committerKent Mein <mein@cs.umn.edu>2005-01-24 19:16:50 +0300
commit1b1ff7ea92a7cbe41139b74812fff108d2785b3e (patch)
treea10ad9d8bf6284cb4f70a666da05aad57ff89b6a /source/gameengine/GameLogic/Makefile
parentbfba62e59e6d5a0fdabf81789aa27cb718ec51a2 (diff)
Fixed the Makefiles so the Joystick stuff works.
Kent
Diffstat (limited to 'source/gameengine/GameLogic/Makefile')
-rw-r--r--source/gameengine/GameLogic/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile
index 07611ceffd6..dcf2163a68b 100644
--- a/source/gameengine/GameLogic/Makefile
+++ b/source/gameengine/GameLogic/Makefile
@@ -33,8 +33,10 @@
LIBNAME = logic
DIR = $(OCGDIR)/gameengine/$(LIBNAME)
+DIRS = Joystick
include nan_compile.mk
+include nan_subdirs.mk
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
@@ -42,8 +44,6 @@ CPPFLAGS += -I../Expressions
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
-CPPFLAGS += -I$(NAN_SDL)
+CPPFLAGS += $(NAN_SDLCFLAGS)
CPPFLAGS += -I../../kernel/gen_system
-
-CCSRCS += Joystick/SCA_Joystick.cpp Joystick/SCA_JoystickEvents.cpp