claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'rawinput' of https://github.com/driver1998/86Box into driver1998-rawinput

Browse Source
This commit is contained in:
OBattler
2020-03-25 02:29:20 +01:00
parent 6b46dcc0aa bf8ff98fd4
commit 132d1f092b
12 changed files with 538 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/win/Makefile.mingw
View File

@@ -196,7 +196,7 @@ ifndef RDP
RDP := n
endif
ifndef DINPUT
DINPUT := n
DINPUT := y
endif
ifndef OPENAL
OPENAL := y
@@ -448,10 +448,6 @@ RDPLIB += -lrdp
RDPOBJ := rdp.o
endif
ifeq ($(DINPUT), y)
OPTS += -DUSE_DINPUT
endif
ifeq ($(DISCORD), y)
OPTS += -DUSE_DISCORD
RFLAGS += -DUSE_DISCORD
@@ -554,7 +550,7 @@ CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
# -funroll-loops
# Add freetyp2 references through pkgconfig
CFLAGS := $(CFLAGS) `pkg-config.exe --cflags freetype2`
CFLAGS := $(CFLAGS) `pkg-config --cflags freetype2`
CXXFLAGS := $(CFLAGS)
@@ -722,7 +718,13 @@ PLATOBJ := win.o \
win_dynld.o win_thread.o \
win_cdrom.o win_keyboard.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) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
@@ -748,12 +750,12 @@ endif
ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm
endif
LIBS += -lpng -lz -lwsock32 -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)
LIBS += -Wl,--large-address-aware
endif
ifneq ($(DINPUT), y)
LIBS += -lxinput
ifeq ($(DINPUT), y)
LIBS += -ldinput8
endif
LIBS += -static
@@ -807,7 +809,7 @@ all: $(PROG).exe pcap_if.exe
$(PROG).exe: $(OBJ) 86Box.res
@echo Linking $(PROG).exe ..
@$(CC) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS) -pipe
@$(CC) $(LDFLAGS) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS) -pipe
ifneq ($(DEBUG), y)
@$(STRIP) $(PROG).exe
endif
@@ -818,7 +820,7 @@ pcap_if.res: pcap_if.rc
pcap_if.exe: pcap_if.o win_dynld.o pcap_if.res
@echo Linking pcap_if.exe ..
@$(CC) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
@$(CC) $(LDFLAGS) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
ifneq ($(DEBUG), y)
@$(STRIP) pcap_if.exe
endif