80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

makefile: add rawinput joystick

Browse Source
This commit is contained in:
GH Cao
2020-02-05 08:07:09 +08:00
parent 8d400e140e
commit 4da7d7492a
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/win/Makefile.mingw
View File

@@ -196,7 +196,7 @@ ifndef RDP
RDP := n RDP := n
endif endif
ifndef DINPUT ifndef DINPUT
DINPUT := n DINPUT := y
endif endif
ifndef OPENAL ifndef OPENAL
OPENAL := y OPENAL := y
@@ -437,10 +437,6 @@ RDPLIB += -lrdp
RDPOBJ := rdp.o RDPOBJ := rdp.o
endif endif
ifeq ($(DINPUT), y)
OPTS += -DUSE_DINPUT
endif
ifeq ($(DISCORD), y) ifeq ($(DISCORD), y)
OPTS += -DUSE_DISCORD OPTS += -DUSE_DISCORD
RFLAGS += -DUSE_DISCORD RFLAGS += -DUSE_DISCORD
@@ -703,7 +699,13 @@ PLATOBJ := win.o \
win_dynld.o win_thread.o \ win_dynld.o win_thread.o \
win_cdrom.o win_keyboard.o \ win_cdrom.o win_keyboard.o \
win_midi.o \ win_midi.o \
win_mouse.o win_joystick.o win_mouse.o
ifeq ($(DINPUT), y)
PLATOBJ += win_joystick.o
else
PLATOBJ += win_joystick_rawinput.o
endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \ OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \ $(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
@@ -729,12 +731,12 @@ endif
ifneq ($(WX), n) ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm LIBS += $(WX_LIBS) -lm
endif endif
LIBS += -lpng -lz -lwsock32 -lshell32 -liphlpapi -ldinput8 -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++ LIBS += -lpng -lz -lwsock32 -lshell32 -liphlpapi -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++
ifneq ($(X64), y) ifneq ($(X64), y)
LIBS += -Wl,--large-address-aware LIBS += -Wl,--large-address-aware
endif endif
ifneq ($(DINPUT), y) ifeq ($(DINPUT), y)
LIBS += -lxinput LIBS += -ldinput8
endif endif
LIBS += -static LIBS += -static

20
src/win/Makefile_ndr.mingw
View File

@@ -196,7 +196,7 @@ ifndef RDP
RDP := n RDP := n
endif endif
ifndef DINPUT ifndef DINPUT
DINPUT := n DINPUT := y
endif endif
ifndef OPENAL ifndef OPENAL
OPENAL := y OPENAL := y
@@ -443,10 +443,6 @@ RDPLIB += -lrdp
RDPOBJ := rdp.o RDPOBJ := rdp.o
endif endif
ifeq ($(DINPUT), y)
OPTS += -DUSE_DINPUT
endif
ifeq ($(DISCORD), y) ifeq ($(DISCORD), y)
OPTS += -DUSE_DISCORD OPTS += -DUSE_DISCORD
RFLAGS += -DUSE_DISCORD RFLAGS += -DUSE_DISCORD
@@ -709,7 +705,13 @@ PLATOBJ := win.o \
win_dynld.o win_thread.o \ win_dynld.o win_thread.o \
win_cdrom.o win_keyboard.o \ win_cdrom.o win_keyboard.o \
win_midi.o \ win_midi.o \
win_mouse.o win_joystick.o win_mouse.o
ifeq ($(DINPUT), y)
PLATOBJ += win_joystick.o
else
PLATOBJ += win_joystick_rawinput.o
endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \ OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \ $(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
@@ -735,12 +737,12 @@ endif
ifneq ($(WX), n) ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm LIBS += $(WX_LIBS) -lm
endif endif
LIBS += -lpng -lz -lwsock32 -lshell32 -liphlpapi -ldinput8 -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++ LIBS += -lpng -lz -lwsock32 -lshell32 -liphlpapi -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++
ifneq ($(X64), y) ifneq ($(X64), y)
LIBS += -Wl,--large-address-aware LIBS += -Wl,--large-address-aware
endif endif
ifneq ($(DINPUT), y) ifeq ($(DINPUT), y)
LIBS += -lxinput LIBS += -ldinput8
endif endif
LIBS += -static LIBS += -static