--- np2/win9x/Makefile	2007/10/26 14:38:34	1.33
+++ np2/win9x/Makefile	2011/02/17 10:36:05	1.35
@@ -1,8 +1,7 @@
 # makefile for cygwin
-#   gcc version 3.3.3
+#   gcc version 4.3.4
 
-
-AS		= nasmw
+AS		= nasm
 CC		= gcc
 RC		= windres
 RM		= rm -f
@@ -39,6 +38,8 @@ I286CASM	= $(I286C)/x86
 IOASM		= $(IO)/x86
 VRAMASM		= $(VRAM)/x86
 
+RESDIR		= ./resources/1252
+
 HEADERS		=	$(TARGET)/compiler.h $(BASE)/common.h $(COMMON)/milstr.h \
 				$(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \
 				$(TARGET)/trace.h
@@ -70,13 +71,13 @@ ZLIBS		=	$(ZLIB)/crc32.h $(ZLIB)/inffast
 
 AOPT	= -f win32
 COPT	= -c -Wall -pipe -O6 -fomit-frame-pointer -fkeep-inline-functions \
-			-fsigned-char -mno-cygwin -march=pentium \
+			-fsigned-char -mwindows -march=pentium \
 			-DWIN32 -DNDEBUG -D_WINDOWS \
 			-I$(BASE) -I$(COMMON) -I$(CODECNV) -I$(I286C) -I$(MEM) -I$(IO) \
 			-I$(CBUS) -I$(BIOS) -I$(LIO) -I$(VRAM) -I$(SOUND) -I$(VERMOUTH) \
 			-I$(GETSND) -I$(FDD) -I$(FONT) -I$(GENERIC) -I$(TARGET) \
 			-I$(DIALOG) -I$(DEBUGUTY) -I$(X86ASM) -I$(ZLIB)
-LOPT	= -mno-cygwin -lstdc++
+LOPT	= -mwindows -lstdc++
 
 NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.o		$(OBJ)/_memory.o	\
 			$(OBJ)/textfile.o	$(OBJ)/profile.o	$(OBJ)/rect.o		\
@@ -1120,8 +1121,8 @@ $(OBJ)/win32sub.o	:	$(TARGET)/win32sub.c
 						$(TARGET)/win32sub.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/np2res.o		:	$(TARGET)/np2res.rc $(TARGET)/resource.h
-	$(RC) -i $< -o $@
+$(OBJ)/np2res.o		:	$(RESDIR)/np2.rc $(TARGET)/resource.h
+	$(RC) -I$(RESDIR) -i $< -o $@