some mingw bits to move its gui variation closer to building and running
This commit is contained in:
@@ -138,6 +138,10 @@ TARGET_CPU=x86
|
||||
#
|
||||
ADD_LUA=Y
|
||||
LUATOP=../lib/lua-5.3.5
|
||||
ifndef LUA_VERSION
|
||||
LUA_VERSION=5.3.5
|
||||
endif
|
||||
|
||||
#
|
||||
#==============================================================================
|
||||
# This marks the end of the BUILD DECISIONS section.
|
||||
@@ -549,7 +553,7 @@ CFLAGSBASE = -c $(cflags) $(WINPINC) $(cdebug) $(CURSESDEF)
|
||||
#LFLAGSBASEG = $(linkdebug) -mwindows
|
||||
baselibs = -lwinmm -lshell32 -lole32 -luuid
|
||||
conlibs = -lgdi32 $(baselibs) $(BCRYPT)
|
||||
guilibs = -lcomctl32 $(baselibs)
|
||||
guilibs = -lcomctl32 $(baselibs) $(BCRYPT)
|
||||
ifeq "$(WANT_WIN_QT4)" "Y"
|
||||
# Might be either Qt 4 or Qt 5
|
||||
ifeq "$(HAVE_QT5)" "Y"
|
||||
@@ -715,7 +719,7 @@ $(QT4)/%.moc : $(QT4)/%.h
|
||||
ifeq "$(SKIP_NETHACKW)" "Y"
|
||||
NETHACKW_EXE =
|
||||
else
|
||||
NETHACKW_EXE = $(GAMEDIR)/NetHack.exe
|
||||
NETHACKW_EXE = $(GAMEDIR)/NetHackW.exe
|
||||
endif
|
||||
|
||||
SHELL=CMD.EXE
|
||||
@@ -1257,8 +1261,8 @@ endif
|
||||
clean:
|
||||
if exist initialchk del initialchk
|
||||
if exist $(W_INCL)\nhlua.h del $(W_INCL)\nhlua.h
|
||||
if exist $(O)install.tag del $(O)install.tag
|
||||
if exist $(O)utility.tag del $(O)utility.tag
|
||||
if exist $(W_OBJ)\install.tag del $(W_OBJ)\install.tag
|
||||
if exist $(W_UTIL)utility.tag del $(W_UTIL)\utility.tag
|
||||
ifneq "$(W_UTIL)" ""
|
||||
if exist $(W_UTIL)\makedefs.exe del $(W_UTIL)\makedefs.exe
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user