Merge multi-touch gestures event branch
This is a squashed commit of the SOC2017_GESTURES branch from https://github.com/prashantkn94/wxWidgets.git Closes https://github.com/wxWidgets/wxWidgets/pull/551
This commit is contained in:
committed by
Vadim Zeitlin
parent
aef4edb969
commit
261b04b5a3
@@ -30,7 +30,8 @@ EVENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
|
||||
EVENT_OBJECTS = \
|
||||
$(OBJS)\event_sample_rc.o \
|
||||
$(OBJS)\event_event.o
|
||||
$(OBJS)\event_event.o \
|
||||
$(OBJS)\event_gestures.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -226,6 +227,9 @@ $(OBJS)\event_sample_rc.o: ./../../samples/sample.rc
|
||||
$(OBJS)\event_event.o: ./event.cpp
|
||||
$(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\event_gestures.o: ./gestures.cpp
|
||||
$(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user