makefiles: include tweaks

This commit is contained in:
bnnm 2021-08-14 17:22:47 +02:00
parent ec18e44a54
commit 7116ad4071
4 changed files with 13 additions and 12 deletions

View File

@ -129,7 +129,7 @@ ifeq ($(TARGET_OS),Windows_NT)
VGM_FFMPEG = 1
ifneq ($(VGM_FFMPEG),0)
LIBS_CFLAGS += -DVGM_USE_FFMPEG
LIBS_CFLAGS += -DVGM_USE_FFMPEG -I../ext_includes/ffmpeg
LIBS_LDFLAGS += -lavcodec -lavformat -lavutil -lswresample
LIBS_TARGET_EXT_LIBS += libavcodec.a libavformat.a libavutil.a libswresample.a
endif

View File

@ -2,12 +2,11 @@
# CLI tools
###############################
###############################################################################
### main defs
LIBAO_IPATH = ../../libao/include
LIBAO_LPATH = ../../libao/bin
###############################################################################
### main defs
CFLAGS += $(DEF_CFLAGS) -DVAR_ARRAYS $(EXTRA_CFLAGS)
LDFLAGS += -L../src -lvgmstream -lm $(EXTRA_LDFLAGS)
@ -18,7 +17,7 @@ ifeq ($(TARGET_OS),Windows_NT)
OUTPUT_123 = vgmstream123.exe
# -DUSE_ALLOCA
CFLAGS += -DWIN32 -I../ext_includes -I../ext_libs/Getopt -I../ext_includes/ffmpeg
CFLAGS += -DWIN32 -I../ext_includes -I../ext_libs/Getopt
LDFLAGS += -L../ext_libs
LIBAO_INC = -I$(LIBAO_IPATH)
@ -27,7 +26,7 @@ else
OUTPUT_CLI = vgmstream-cli
OUTPUT_123 = vgmstream123
#todo move clhca/etc and remove
#todo move to subfolders and remove
CFLAGS += -I../ext_includes
LIBAO_LIB = -lao

View File

@ -14,16 +14,18 @@ endif
###############################################################################
### main defs
CFLAGS += $(DEF_CFLAGS) $(EXTRA_CFLAGS)
LDFLAGS += -L../src -lvgmstream -lm $(EXTRA_LDFLAGS)
TARGET_EXT_LIBS =
OUTPUT_WINAMP = in_vgmstream.dll
ifeq ($(TARGET_OS),Windows_NT)
CFLAGS += -m32 -DUSE_ALLOCA -DWIN32 -I../ext_includes/ffmpeg
CFLAGS += -DWIN32 -m32 -DUSE_ALLOCA -I../ext_includes
LDFLAGS += -L../ext_libs
endif
CFLAGS += $(DEF_CFLAGS) -I../ext_includes $(EXTRA_CFLAGS)
LDFLAGS += -L../src -L../ext_libs -lvgmstream -lm $(EXTRA_LDFLAGS)
TARGET_EXT_LIBS =
CFLAGS += $(LIBS_CFLAGS)
LDFLAGS += $(LIBS_LDFLAGS)
TARGET_EXT_LIBS += $(LIBS_TARGET_EXT_LIBS)

View File

@ -17,7 +17,7 @@ endif
OUTPUT_XMPLAY = xmp-vgmstream.dll
ifeq ($(TARGET_OS),Windows_NT)
CFLAGS += -m32 -DUSE_ALLOCA -DWIN32 -I../ext_includes/ffmpeg
CFLAGS += -m32 -DUSE_ALLOCA -DWIN32
endif
CFLAGS += $(DEF_CFLAGS) -I../ext_includes $(EXTRA_CFLAGS)