Commit

Makefile.in

@@ -16,6 +16,7 @@ CONF_EMU=@CONF_EMU@
 CONF_SYSTEM=@CONF_SYSTEM@
 CONF_HOST=@CONF_HOST@
 CONF_BUILD=@CONF_BUILD@
+CONF_LIB_DIRECT=@CONF_LIB_DIRECT@
 CONF_LIB_ZLIB=@CONF_LIB_ZLIB@
 CONF_LIB_EXPAT=@CONF_LIB_EXPAT@
 CONF_LIB_SVGALIB=@CONF_LIB_SVGALIB@
@@ -34,6 +35,8 @@ CONF_LIB_MRAW=@CONF_LIB_MRAW@
 CONF_LIB_KEVENT=@CONF_LIB_KEVENT@
 CONF_LIB_JEVENT=@CONF_LIB_JEVENT@
 CONF_LIB_MEVENT=@CONF_LIB_MEVENT@
+CONF_LIB_MRAWINPUT=@CONF_LIB_MRAWINPUT@
+CONF_LIB_MCPN=@CONF_LIB_MCPN@
 CONF_CFLAGS_ARCH=@CONF_CFLAGS_ARCH@
 CONF_CFLAGS_OPT=@CONF_CFLAGS_OPT@
 CONF_LDFLAGS=@CONF_LDFLAGS@

Makefile.usr

@@ -38,14 +38,15 @@ prefix=/usr/local
 #   SDL for the sound
 #   SDL for the keyboard
 #   SDL for the joystick
-#   SDL for the mouse
+#   MRAWINPUT, MCPN, SDL for the mouse
 #   none for the Multiprocessor support (no Multiprocessor support)
 #
 #CONF_HOST=linux
 #CONF_HOST=dos
 #CONF_HOST=windows
 
 # Uncomment and set to "no" to disable some libraries:
+#CONF_LIB_DIRECT=yes
 #CONF_LIB_SVGALIB=yes
 #CONF_LIB_SVGAWIN=yes
 #CONF_LIB_SDL=yes
@@ -62,6 +63,8 @@ prefix=/usr/local
 #CONF_LIB_KEVENT=yes
 #CONF_LIB_JEVENT=yes
 #CONF_LIB_MEVENT=yes
+#CONF_LIB_MRAWINPUT=yes
+#CONF_LIB_MCPN=yes
 
 # Select the optimization flags: (optimized build for Pentium by default)
 # Optimized build for Pentium
@@ -137,6 +140,10 @@ CONF_LIB_EXPAT=yes
 endif
 endif
 
+ifndef CONF_LIB_DIRECT
+CONF_LIB_DIRECT=yes
+endif
+
 ifndef CONF_LIB_SVGALIB
 CONF_LIB_SVGALIB=no
 endif
@@ -201,6 +208,14 @@ ifndef CONF_LIB_MEVENT
 CONF_LIB_MEVENT=yes
 endif
 
+ifndef CONF_LIB_MRAWINPUT
+CONF_LIB_MRAWINPUT=yes
+endif
+
+ifndef CONF_LIB_MCPN
+CONF_LIB_MCPN=yes
+endif
+
 ifndef CONF_CFLAGS_ARCH
 CONF_CFLAGS_ARCH = -DUSE_LSB -DUSE_ASM_INLINE -DUSE_ASM_EMUMIPS3
 endif
@@ -349,9 +364,9 @@ ifeq ($(CONF_BUILD),windows)
 ASM = @nasmw
 EXE_FOR_BUILD = .exe
 CC_FOR_BUILD = @gcc
-LD_FOR_BUILD = @gcc
+LD_FOR_BUILD = @gcc "-LC:\MINGW\LIB" 
 CXX_FOR_BUILD = @g++
-LDXX_FOR_BUILD = @g++
+LDXX_FOR_BUILD = @g++ "-LC:\MINGW\LIB" 
 AR = @ar
 CC = @gcc
 CXX = @g++
@@ -362,7 +377,7 @@ RC = @windres
 SDLCFLAGS = "-IC:\MINGW\INCLUDE" "-IC:\MINGW\INCLUDE\SDL"
 SDLLIBS = "-LC:\MINGW\LIB" -lmingw32 -lSDL -mwindows
 FREETYPECFLAGS = "-IC:\MINGW\INCLUDE" "-IC:\MINGW\INCLUDE\FREETYPE2"
-FREETYPELIBS = "-LC:\MINGW\LIB" -lfreetype -lz
+FREETYPELIBS = -lfreetype -lz
 endif
 
 # No installation with the manual configuration

advance/advance.mak

@@ -17,8 +17,8 @@ DOCOBJ = $(srcdir)/doc
 ############################################################################
 # Common targets
 
-ifdef ADVANCE_ALL
-all_override: $(ADVANCE_ALL)
+ifdef ADV_ALL
+all_override: $(ADV_ALL)
 endif
 
 ifneq ($(wildcard $(EMUSRC)),)
@@ -41,6 +41,7 @@ INSTALL_DIRS += $(MENUOBJ)
 INSTALL_BINFILES += $(MENUOBJ)/advmenu$(EXE)
 INSTALL_MANFILES += $(DOCOBJ)/advmenu.1
 endif
+ifeq ($(CONF_LIB_DIRECT),yes)
 ifneq ($(wildcard $(srcdir)/advance/cfg.mak),)
 INSTALL_DIRS += $(CFGOBJ)
 INSTALL_BINFILES += $(CFGOBJ)/advcfg$(EXE)
@@ -51,6 +52,7 @@ INSTALL_DIRS += $(VOBJ)
 INSTALL_BINFILES += $(VOBJ)/advv$(EXE)
 INSTALL_MANFILES += $(DOCOBJ)/advv.1
 endif
+endif
 ifneq ($(CONF_SYSTEM),windows)
 ifneq ($(wildcard $(srcdir)/advance/s.mak),)
 INSTALL_DIRS += $(SOBJ)
@@ -392,7 +394,7 @@ ARCH_PENTIUM_BLEND_GCC2 = CONF_MAP=yes CONF_ARCH=pentium CONF_CFLAGS_OPT="-march
 MANUAL=-f Makefile.usr
 
 WHOLECD_FLAGS = \
-	DATADIR="/root" SYSCONFDIR="/etc" \
+	ADV_DATADIR="/root" ADV_SYSCONFDIR="/etc" \
 	CONF_ARCH=cd CONF_CFLAGS_OPT="-march=pentium -mtune=pentium2 $(WHOLE_CFLAGS_OPT) -fno-merge-constants" CONF_CFLAGS_EMU="$(WHOLE_CFLAGS_EMU)" CONF_LDFLAGS="$(WHOLE_LDFLAGS)" \
 	CONF_DEFS="$(DEFS_LINUX)" \
 	CONF_HOST=linux \