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
@@ -36,7 +36,8 @@ EVENT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
|
||||
$(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
|
||||
EVENT_OBJECTS = \
|
||||
$(OBJS)\event_event.obj
|
||||
$(OBJS)\event_event.obj \
|
||||
$(OBJS)\event_gestures.obj
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -237,3 +238,5 @@ $(OBJS)\event_sample.res: .\..\..\samples\sample.rc
|
||||
$(OBJS)\event_event.obj: .\event.cpp
|
||||
$(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp
|
||||
|
||||
$(OBJS)\event_gestures.obj: .\gestures.cpp
|
||||
$(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\gestures.cpp
|
||||
|
Reference in New Issue
Block a user