mirror of
https://github.com/libretro/RetroArch
synced 2025-02-18 18:40:06 +00:00
Fix Win32 build.
This commit is contained in:
parent
8a1327cefd
commit
aa6a17b6ab
@ -83,10 +83,13 @@ else ifeq ($(HAVE_FFMPEG), 1)
|
|||||||
OBJ += gfx/scaler/scaler.o gfx/scaler/pixconv.o gfx/scaler/scaler_int.o gfx/scaler/filter.o
|
OBJ += gfx/scaler/scaler.o gfx/scaler/pixconv.o gfx/scaler/scaler_int.o gfx/scaler/filter.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
JLIBS =
|
||||||
|
|
||||||
ifeq ($(HAVE_SDL), 1)
|
ifeq ($(HAVE_SDL), 1)
|
||||||
OBJ += gfx/sdl_gfx.o gfx/context/sdl_ctx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
|
OBJ += gfx/sdl_gfx.o gfx/context/sdl_ctx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
|
||||||
JOBJ += input/sdl_joypad.o
|
JOBJ += input/sdl_joypad.o
|
||||||
LIBS += -lSDL
|
LIBS += -lSDL
|
||||||
|
JLIBS += -lSDL
|
||||||
DEFINES += -ISDL -DHAVE_SDL
|
DEFINES += -ISDL -DHAVE_SDL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -234,9 +237,9 @@ $(TARGET): $(OBJ)
|
|||||||
|
|
||||||
$(JTARGET): $(JOBJ)
|
$(JTARGET): $(JOBJ)
|
||||||
ifeq ($(CXX_BUILD), 1)
|
ifeq ($(CXX_BUILD), 1)
|
||||||
$(Q)$(CXX) -o $@ $(JOBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS)
|
$(Q)$(CXX) -o $@ $(JOBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JLIBS)
|
||||||
else
|
else
|
||||||
$(Q)$(CC) -o $@ $(JOBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS)
|
$(Q)$(CC) -o $@ $(JOBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JLIBS)
|
||||||
endif
|
endif
|
||||||
@$(if $(Q), $(shell echo echo LD $@),)
|
@$(if $(Q), $(shell echo echo LD $@),)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user