diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk
index a79b6363..29aee174 100755
--- a/cl_dll/Android.mk
+++ b/cl_dll/Android.mk
@@ -68,6 +68,8 @@ SRCS+=./hud_spectator.cpp
 SRCS+=./hud_update.cpp
 SRCS+=./in_camera.cpp
 SRCS+=./input.cpp
+SRCS+=./input_goldsource.cpp
+SRCS+=./input_mouse.cpp
 #SRCS+=./inputw32.cpp
 SRCS+=./menu.cpp
 SRCS+=./message.cpp
@@ -100,6 +102,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
 		 $(LOCAL_PATH)/../pm_shared
 LOCAL_CFLAGS += $(DEFINES) $(INCLUDES)
 
+ifeq ($(GOLDSOURCE_SUPPORT),1)
+	DEFINES += -DGOLDSOURCE_SUPPORT
+	LOCAL_LDLIBS += -lSDL2
+endif
+
 LOCAL_SRC_FILES := $(SRCS) $(SRCS_C)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/cl_dll/Makefile b/cl_dll/Makefile
index 983b61c0..16427f8f 100644
--- a/cl_dll/Makefile
+++ b/cl_dll/Makefile
@@ -45,7 +45,8 @@ SRCS+=./hud_spectator.cpp
 SRCS+=./hud_update.cpp
 SRCS+=./in_camera.cpp
 SRCS+=./input.cpp
-#SRCS+=./inputw32.cpp
+SRCS+=./input_mouse.cpp
+SRCS+=./input_goldsource.cpp
 SRCS+=./menu.cpp
 SRCS+=./message.cpp
 SRCS+=./overview.cpp
@@ -72,9 +73,13 @@ CFLAGS = -m32
 OBJS = $(SRCS:.cpp=.o) $(SRCS_C:.c=.o)
 
 LIBS=-lm
+ifeq ($(GOLDSOURCE_SUPPORT),1)
+	DEFINES += -DGOLDSOURCE_SUPPORT
+	LIBS += -lSDL2
+endif
 
 ifeq ($(shell uname -s),Linux)
-	LIBS=$(LIBS) -ldl
+	LIBS += -ldl
 endif
 
 %.o : %.c
@@ -83,7 +88,7 @@ endif
 %.o : %.cpp
 	$(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) -fPIC -c $< -o $@
 client.so : $(OBJS)
-	$(CXX) $(OBJS) -o client.so -shared -Wl,--no-undefined -fPIC $(LIBS)
+	$(CXX) $(CFLAGS) $(OBJS) -o client.so -shared -Wl,--no-undefined -fPIC $(LIBS)
 
 clean:
 	$(RM) $(OBJS)
diff --git a/cl_dll/cl_dll.dsp b/cl_dll/cl_dll.dsp
index 6864326b..e8ae7d15 100644
--- a/cl_dll/cl_dll.dsp
+++ b/cl_dll/cl_dll.dsp
@@ -300,7 +300,15 @@ SOURCE=.\input.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\inputw32.cpp
+SOURCE=.\input_goldsource.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\input_mouse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\input_xash3d.cpp
 # End Source File
 # Begin Source File
 
@@ -513,6 +521,10 @@ SOURCE=.\in_defs.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\input_mouse.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\common\itrackeruser.h
 # End Source File
 # Begin Source File