lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revised MinGW Makefile logic for OpenMPT

This commit is contained in:
mazmazz 2019-01-02 02:37:48 -05:00
parent 7f18433059
commit 08812b1501
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Makefile
View File

@ -184,6 +184,16 @@ ifdef DJGPPDOS
include djgppdos/Makefile.cfg
endif
ifdef MINGW
ifndef NOOPENMPT
HAVE_OPENMPT=1
endif
else
ifdef OPENMPT
HAVE_OPENMPT=1
endif
endif
ifdef MINGW
include win32/Makefile.cfg
endif #ifdef MINGW
@ -199,22 +209,6 @@ HAVE_LIBGME=1
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
UNIXCOMMON=1
endif

6
src/win32/Makefile.cfg
View File

@ -11,8 +11,7 @@ ifdef MINGW64
LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme
ifndef NOOPENMPT
HAVE_OPENMPT=1
ifdef HAVE_OPENMPT
LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -llibopenmpt
endif
@ -24,8 +23,7 @@ else
LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
ifndef NOOPENMPT
HAVE_OPENMPT=1
ifdef HAVE_OPENMPT
LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -llibopenmpt
endif