Update src/Makefile.win, add base Makefile.win, mark Makefile.wat as …

…deprecated
iris-edu · Apr 4, 2017 · dff735d · dff735d
1 parent 8a62a19
commit dff735d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/Makefile.wat b/Makefile.wat
@@ -1,4 +1,6 @@
 #
+# THIS FILE IS DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE
+#
 # Wmake File for seisan2mseed - For Watcom's wmake
 # Use 'wmake -f Makefile.wat'
 

diff --git a/src/Makefile.wat b/src/Makefile.wat
@@ -1,4 +1,6 @@
 #
+# THIS FILE IS DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE
+#
 # Wmake File - for Watcom's wmake
 # Use 'wmake -f Makefile.wat'
 

diff --git a/src/Makefile.win b/src/Makefile.win
@@ -1,28 +1,22 @@
 #
 # Nmake file - Windows version
 # Use 'nmake -f Makefile.win'
-#
-# THIS HAS NEVER BEEN TESTED
-# Some modification might be required.
 
 NODEBUG=1
 
-!include <ntwin32.mak>
-
 INCS = /I..\libmseed
+OPTS = -D_CRT_SECURE_NO_WARNINGS
 LIBS = ..\libmseed\libmseed.lib
 
 BIN = ..\ascii2mseed.exe
 
-cflags = $(cflags) -DWIN32
-
 all: $(BIN)
 
 $(BIN):	ascii2mseed.obj
 	link.exe /nologo /out:$(BIN) $(LIBS) ascii2mseed.obj
 
 .c.obj:
-   $(cc) /nologo $(cflags) $(cdebug) $(cvarsmt) $(tflags) $(INCS) $<
+	$(CC) /nologo $(CFLAGS) $(INCS) $(OPTS) /c $<
 
 # Clean-up directives
 clean:

diff --git a/src/ascii2mseed.c b/src/ascii2mseed.c
@@ -17,7 +17,7 @@
 
 #include <libmseed.h>
 
-#define VERSION "1.4"
+#define VERSION "1.5dev"
 #define PACKAGE "ascii2mseed"
 
 struct listnode {