Skip to content

Multiple mouse support with working threshold using ManyMouse. #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h0tw1r3 wants to merge 2 commits into
base: master
Choose a base branch
from
+4,325 −163
Open

Multiple mouse support with working threshold using ManyMouse. #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee83ad5
Multiple mouse support with working threshold using ManyMouse.
h0tw1r3 Jun 3, 2015
747cd8e
fix compiler warnings, mostly osx
h0tw1r3 Sep 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,9 @@ ifeq ($(FE_WINDOWS_COMPILE),1)
SQUIRREL += $(OBJ_DIR)/libnowide.a
endif

CFLAGS += -I$(EXTLIBS_DIR)/manymouse
MANYMOUSE = $(OBJ_DIR)/libmanymouse.a

ifeq ($(NO_SWF),1)
FE_FLAGS += -DNO_SWF
else
Expand Down Expand Up @@ -489,7 +492,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
$(CC_MSG)
$(SILENT)$(CC) -c -o $@ $< $(CFLAGS) $(FE_FLAGS)

$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO) $(MANYMOUSE)
$(EXE_MSG)
$(SILENT)$(CXX) -o $@ $^ $(CFLAGS) $(FE_FLAGS) $(LIBS)
ifneq ($(FE_DEBUG),1)
Expand Down Expand Up @@ -524,6 +527,31 @@ $(EXPAT_OBJ_DIR)/%.o: $(EXTLIBS_DIR)/expat/%.c | $(EXPAT_OBJ_DIR)
$(EXPAT_OBJ_DIR):
$(MD) $@

#
# ManyMouse Library
#
MANYMOUSE_FLAGS = -fno-exceptions -fno-strict-aliasing -Wno-tautological-pointer-compare
MANYMOUSE_OBJ_DIR = $(OBJ_DIR)/manymouse

MANYMOUSE_OBJS= \
$(MANYMOUSE_OBJ_DIR)/linux_evdev.o \
$(MANYMOUSE_OBJ_DIR)/macosx_hidmanager.o \
$(MANYMOUSE_OBJ_DIR)/macosx_hidutilities.o \
$(MANYMOUSE_OBJ_DIR)/manymouse.o \
$(MANYMOUSE_OBJ_DIR)/windows_wminput.o \
$(MANYMOUSE_OBJ_DIR)/x11_xinput2.o

$(OBJ_DIR)/libmanymouse.a: $(MANYMOUSE_OBJS) | $(MANYMOUSE_OBJ_DIR)
$(AR_MSG)
$(SILENT)$(AR) $(ARFLAGS) $@ $(MANYMOUSE_OBJS)

$(MANYMOUSE_OBJ_DIR)/%.o: $(EXTLIBS_DIR)/manymouse/manymouse/%.c | $(MANYMOUSE_OBJ_DIR)
$(CC_MSG)
$(SILENT)$(CC) -c $< -o $@ $(CFLAGS) $(MANYMOUSE_FLAGS)

$(MANYMOUSE_OBJ_DIR):
$(MD) $@

#
# Squirrel Library
#
Expand Down Expand Up @@ -766,4 +794,4 @@ smallclean:
-$(RM) $(OBJ_DIR)/*.o *~ core

clean:
-$(RM) $(OBJ_DIR)/*.o $(EXPAT_OBJ_DIR)/*.o $(SQUIRREL_OBJ_DIR)/*.o $(SQSTDLIB_OBJ_DIR)/*.o $(AUDIO_OBJ_DIR)/*.o $(NOWIDE_OBJ_DIR)/*.o $(GSBASE_OBJ_DIR)/*.o $(GAMESWF_OBJ_DIR)/*.o $(GAMESWF_OBJ_DIR)/gameswf_as_classes/*.o $(OBJ_DIR)/*.a $(OBJ_DIR)/*.res *~ core
-$(RM) $(OBJ_DIR)/*.o $(EXPAT_OBJ_DIR)/*.o $(SQUIRREL_OBJ_DIR)/*.o $(SQSTDLIB_OBJ_DIR)/*.o $(AUDIO_OBJ_DIR)/*.o $(NOWIDE_OBJ_DIR)/*.o $(GSBASE_OBJ_DIR)/*.o $(GAMESWF_OBJ_DIR)/*.o $(GAMESWF_OBJ_DIR)/gameswf_as_classes/*.o $(MANYMOUSE_OBJ_DIR)/*.o $(OBJ_DIR)/*.a $(OBJ_DIR)/*.res *~ core
2 changes: 1 addition & 1 deletion extlibs/gameswf/gameswf/gameswf_environment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace gameswf

// stack access/manipulation
// @@ TODO do more checking on these
struct vm_stack : private array<as_value>
struct vm_stack : public array<as_value>
{
vm_stack() :
m_stack_size(0)
Expand Down
Loading