Revised MinGW Makefile logic for OpenMPT
This commit is contained in:
parent
7f18433059
commit
08812b1501
26
src/Makefile
26
src/Makefile
|
@ -184,6 +184,16 @@ ifdef DJGPPDOS
|
||||||
include djgppdos/Makefile.cfg
|
include djgppdos/Makefile.cfg
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MINGW
|
||||||
|
ifndef NOOPENMPT
|
||||||
|
HAVE_OPENMPT=1
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
ifdef OPENMPT
|
||||||
|
HAVE_OPENMPT=1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
include win32/Makefile.cfg
|
include win32/Makefile.cfg
|
||||||
endif #ifdef MINGW
|
endif #ifdef MINGW
|
||||||
|
@ -199,22 +209,6 @@ HAVE_LIBGME=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MINGW
|
|
||||||
ifndef NOOPENMPT
|
|
||||||
HAVE_OPENMPT=1
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
ifdef MINGW64
|
|
||||||
ifndef NOOPENMPT
|
|
||||||
HAVE_OPENMPT=1
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
ifdef OPENMPT
|
|
||||||
HAVE_OPENMPT=1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef SOLARIS
|
ifdef SOLARIS
|
||||||
UNIXCOMMON=1
|
UNIXCOMMON=1
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,8 +11,7 @@ ifdef MINGW64
|
||||||
LIBGME_CFLAGS=-I../libs/gme/include
|
LIBGME_CFLAGS=-I../libs/gme/include
|
||||||
LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme
|
LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme
|
||||||
|
|
||||||
ifndef NOOPENMPT
|
ifdef HAVE_OPENMPT
|
||||||
HAVE_OPENMPT=1
|
|
||||||
LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
|
LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
|
||||||
LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -llibopenmpt
|
LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -llibopenmpt
|
||||||
endif
|
endif
|
||||||
|
@ -24,8 +23,7 @@ else
|
||||||
LIBGME_CFLAGS=-I../libs/gme/include
|
LIBGME_CFLAGS=-I../libs/gme/include
|
||||||
LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
|
LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
|
||||||
|
|
||||||
ifndef NOOPENMPT
|
ifdef HAVE_OPENMPT
|
||||||
HAVE_OPENMPT=1
|
|
||||||
LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
|
LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
|
||||||
LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -llibopenmpt
|
LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -llibopenmpt
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue