Initial revision

[bpt/emacs.git] / nt / makefile.def

diff --git a/nt/makefile.def b/nt/makefile.def
index 9d18d00..e83b0b7 100644 (file)
--- a/nt/makefile.def
+++ b/nt/makefile.def
@@ -13,7 +13,8 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
 #
 #     Geoff Voelker (voelker@cs.washington.edu)         9-6-94
 
@@ -80,7 +81,7 @@ ARCH          = ppc
 # We're on Windows 95
 ARCH           = i386
 CPU            = i386
-CONFIG_H       = config.w95
+CONFIG_H       = config.nt
 OS_TYPE                = win95
 !endif
 
@@ -125,7 +126,7 @@ BASE_LIBS   = $(libc) $(baselibs)
 !if "$(LINK)" == "link32"
 SYS_LDFLAGS    = 
 !else
-SYS_LDFLAGS    = -pdb:none -release -incremental:no
+SYS_LDFLAGS    = -pdb:none -release -incremental:no -version:3.10
 !endif
 
 INC             = -I.
@@ -139,17 +140,27 @@ CFLAGS          = $(CFLAGS_COMMON)
 CFLAGS          = $(CFLAGS) -DHAVE_NTGUI=1
 !endif
 
+!ifdef BUILD_TYPE
+OBJDIR          = obj-$(BUILD_TYPE)
+!else
 OBJDIR          = obj
+!endif
 $(OBJDIR):;    -mkdir $(OBJDIR)
 BLD             = $(OBJDIR)\$(ARCH)
 $(BLD):         $(OBJDIR)
                -mkdir $(BLD)
 
 CP             = copy
-CP_DIR         = xcopy /fried
+CP_DIR         = xcopy /f/r/i/e/d
 
+!if "$(OS_TYPE)" == "win95"
+DEL            = deltree /y
+DEL_TREE       = deltree /y
+!else
+DEL            = del
 # This is completely braindamaged, but it's the only routine known to be there
 DEL_TREE       = echo y | rmdir /s
+!endif
 
 # The location of the icon file
 EMACS_ICON_PATH = ..\nt\emacs.ico
@@ -158,7 +169,11 @@ EMACS_ICON_PATH = ..\nt\emacs.ico
 ADDPM          = ..\nt\$(BLD)\addpm.exe
 
 !if "$(ARCH)" == "i386"
+!if "$(BUILD_TYPE)" == "spd"
+ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -O2b2 -G5d -Zi
+!else
 ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -G3d -Zi -Od
+!endif
 ARCH_LDFLAGS   = -align:0x1000 $(SYS_LDFLAGS)
 
 !else