mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 00:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixups in Makefile.

Browse Source
This commit is contained in:
Themaister 2011-08-28 22:19:02 +02:00
parent ef048fcfd5
commit c1954aa4a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.win
View File

@ -85,7 +85,7 @@ endif
ifeq ($(HAVE_FREETYPE), 1) ifeq ($(HAVE_FREETYPE), 1)
OBJ += gfx/fonts.o OBJ += gfx/fonts.o
DEFINES += -DHAVE_FREETYPE -Ifreetype2 DEFINES += -DHAVE_FREETYPE -Ifreetype2
LIBS += -lz -lfreetype6 LIBS += -lfreetype -lz
endif endif
ifeq ($(DYNAMIC), 1) ifeq ($(DYNAMIC), 1)
@ -115,7 +115,7 @@ ifeq ($(HAVE_DINPUT), 1)
endif endif
ifeq ($(HAVE_FFMPEG), 1) ifeq ($(HAVE_FFMPEG), 1)
LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lzlib1 LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lz
DEFINES += -DHAVE_FFMPEG -Iffmpeg DEFINES += -DHAVE_FFMPEG -Iffmpeg
OBJ += record/ffemu.o OBJ += record/ffemu.o
endif endif
@ -143,7 +143,7 @@ $(TARGET): $(OBJ)
$(JTARGET): $(JOBJ) $(JTARGET): $(JOBJ)
$(Q)$(CC) -o $@ $(JOBJ) $(SDL_LIBS) $(LDFLAGS) $(Q)$(CC) -o $@ $(JOBJ) -lSDL $(LDFLAGS)
@$(if $(Q), $(shell echo echo LD $@),) @$(if $(Q), $(shell echo echo LD $@),)
clean: clean: