windows substitution error in gcc Makefile

diff --git a/sys/windows/Makefile.gcc b/sys/windows/Makefile.gcc
index 4532a9c73873d7c934f10734964ddc6bf2d25a6b..3db145fcbeba0f32b26151fd66a05e02d35c55e2 100644 (file)
--- a/sys/windows/Makefile.gcc
+++ b/sys/windows/Makefile.gcc
@@ -352,7 +352,7 @@ else
 CURSESOBJ=
 endif
 
-SOBJ   = $(O)windmain.o $(O)windsyso $(O)win10.o \
+SOBJ   = $(O)windmain.o $(O)windsys.o $(O)win10.o \
        $(O)safeproc.o $(O)nhlan.o $(SOUND)
 
 OBJS   = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \
@@ -796,7 +796,7 @@ endif
 #
        $(subst /,\,echo install done > $@)
 
-#  copy $(MSWSYS)/windsyshlp    $(GAMEDIR)
+#  copy $(MSWSYS)/windsys.hlp    $(GAMEDIR)
 
 recover: $(U)recover.exe
        $(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR))
@@ -1324,8 +1324,8 @@ endif
 
 $(O)consoletty.o:   $(HACK_H) $(TILE_H) $(MSWSYS)/win32api.h $(MSWSYS)/consoletty.c
        $(cc) $(CFLAGS) -I$(WSHR) -o$@  $(MSWSYS)/consoletty.c
-$(O)windsyso: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/windsysc
-       $(cc) $(CFLAGS) -o$@  $(MSWSYS)/windsysc
+$(O)windsys.o: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/windsys.c
+       $(cc) $(CFLAGS) -o$@  $(MSWSYS)/windsys.c
 $(O)ntsound.o: $(HACK_H) $(MSWSYS)/ntsound.c
        $(cc) $(CFLAGS)  -o$@ $(MSWSYS)/ntsound.c
 

diff --git a/sys/windows/vs/uudecode/uudecode.vcxproj b/sys/windows/vs/uudecode/uudecode.vcxproj
index e01a6973891a18f719d2933d907f712cadf3e8b2..c1aa232d69a27a02b1af1977da26e98ec517b49d 100644 (file)
--- a/sys/windows/vs/uudecode/uudecode.vcxproj
+++ b/sys/windows/vs/uudecode/uudecode.vcxproj
@@ -23,14 +23,9 @@
   <Import Project="$(vsDir)console.props" />\r
   <Import Project="$(vsDir)common.props" />\r
   <Import Project="$(vsDir)files.props" />\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+  <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir)</AdditionalIncludeDirectories>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>$(IncDir)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(IncDir);$(SysShareDir);</AdditionalIncludeDirectories>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r