Update build files for windows

diff --git a/windows/cmd/lneato/lneato.mak b/windows/cmd/lneato/lneato.mak
index ebb5ebfa07b13a8fad6540fabf4294af458eb21d..7912d42787c14cd05188dd859641511d44220439 100755 (executable)
--- a/windows/cmd/lneato/lneato.mak
+++ b/windows/cmd/lneato/lneato.mak
@@ -25,6 +25,10 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
 !IF  "$(CFG)" == "lneato - Win32 Release"\r
 \r
 OUTDIR=.\Release\r
@@ -44,42 +48,8 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP=cl.exe\r
 CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "MSWIN32" /Fp"$(INTDIR)\lneato.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-MTL=midl.exe\r
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-RSC=rc.exe\r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\lneato.bsc" \r
 BSC32_SBRS= \\r
@@ -94,15 +64,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
 !ELSEIF  "$(CFG)" == "lneato - Win32 Debug"\r
 \r
 OUTDIR=.\Debug\r
@@ -125,8 +86,23 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP=cl.exe\r
 CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "MSWIN32" /Fp"$(INTDIR)\lneato.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\lneato.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\lneato.pdb" /debug /machine:I386 /out:"$(OUTDIR)\lneato.exe" /pdbtype:sept \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\lneato.obj"\r
+\r
+"$(OUTDIR)\lneato.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+!ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -158,35 +134,6 @@ CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /
    $(CPP_PROJ) $< \r
 <<\r
 \r
-MTL=midl.exe\r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-RSC=rc.exe\r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\lneato.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\lneato.pdb" /debug /machine:I386 /out:"$(OUTDIR)\lneato.exe" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\lneato.obj"\r
-\r
-"$(OUTDIR)\lneato.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-\r
-!ENDIF \r
-\r
 \r
 !IF "$(NO_EXTERNAL_DEPS)" != "1"\r
 !IF EXISTS("lneato.dep")\r

diff --git a/windows/cmd/tools/Acyclic.dsp b/windows/cmd/tools/Acyclic.dsp
index 6eb19cab1addd15daa9237b874844c75fe9842ea..c110a1087ef0d582fe7ff1a52dfeac19e9a309aa 100644 (file)
--- a/windows/cmd/tools/Acyclic.dsp
+++ b/windows/cmd/tools/Acyclic.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../src" /I "../.." /I "../../graph" /I "../../cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -69,7 +69,7 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../src" /I "../.." /I "../../graph" /I "../../cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -93,7 +93,7 @@ SOURCE="$(InputPath)"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\src\acyclic.c\r
+SOURCE=.\acyclic.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r