CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-04 09:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile.win - change JLIBS to JOYCONFIG_LIBS

Browse Source
This commit is contained in:
twinaphex 2014-09-14 00:20:30 +02:00
parent 5a12852489
commit caebce79fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.win
View File

@ -35,7 +35,7 @@ OBJDIR := obj-w32
OBJ :=
LIBS := -lm
JLIBS :=
JOYCONFIG_LIBS :=
DEFINES := -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
include Makefile.common
@ -111,7 +111,7 @@ ifeq ($(HAVE_SDL2), 1)
JOYCONFIG_OBJ += input/sdl_joypad.o
LIBS += -lSDL2
JLIBS += -lSDL2
JOYCONFIG_LIBS += -lSDL2
DEFINES += -ISDL2 -DHAVE_SDL2
HAVE_SDL = 0
endif
@ -125,7 +125,7 @@ ifeq ($(HAVE_SDL), 1)
JOYCONFIG_OBJ += input/sdl_joypad.o
LIBS += -lSDL
JLIBS += -lSDL
JOYCONFIG_LIBS += -lSDL
DEFINES += -ISDL -DHAVE_SDL
endif
@ -187,7 +187,7 @@ ifeq ($(HAVE_ZLIB), 1)
DEFINES += -DWANT_MINIZ
else
LIBS += -lz
JLIBS += -lz
JOYCONFIG_LIBS += -lz
DEFINES += -DHAVE_ZLIB_DEFLATE
endif
endif
@ -361,9 +361,9 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
$(JTARGET): $(RARCH_JOYCONFIG_OBJ)
@$(if $(Q), $(shell echo echo LD $@),)
ifeq ($(CXX_BUILD), 1)
$(Q)$(CXX) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JLIBS)
$(Q)$(CXX) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
else
$(Q)$(CC) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JLIBS)
$(Q)$(CC) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
endif
clean: