Making Michael Stahl happy (even in libfreehand)

3 files changed, 18 insertions, 18 deletions

diff --git a/build/win32/fh2raw.dsp b/build/win32/fh2raw.dsp
index 30b4da4..de24a79 100644
--- a/build/win32/fh2raw.dsp
+++ b/build/win32/fh2raw.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe

 # ADD BASE MTL /nologo /win32

 # ADD MTL /nologo /win32

-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c

+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe

 # ADD BASE MTL /nologo /win32

 # ADD MTL /nologo /win32

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c

-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c

+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/build/win32/fh2xhtml.dsp b/build/win32/fh2xhtml.dsp
index 9488977..a520a6d 100644
--- a/build/win32/fh2xhtml.dsp
+++ b/build/win32/fh2xhtml.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe

 # ADD BASE MTL /nologo /win32

 # ADD MTL /nologo /win32

-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c

+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe

 # ADD BASE MTL /nologo /win32

 # ADD MTL /nologo /win32

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c

-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c

+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/build/win32/libfreehand.dsp b/build/win32/libfreehand.dsp
index 8005ac7..ad98256 100644
--- a/build/win32/libfreehand.dsp
+++ b/build/win32/libfreehand.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c

+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -64,8 +64,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -115,27 +115,27 @@ SOURCE=..\..\src\lib\FHSVGGenerator.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\src\lib\libfreehand.h

+SOURCE=..\..\inc\libfreehand\libfreehand.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\libfreehand_utils.h

+SOURCE=..\..\inc\libfreehand\FreeHandDocument.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\FHCollector.h

+SOURCE=..\..\inc\libfreehand\FHStringVector.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\FreeHandDocument.h

+SOURCE=..\..\src\lib\libfreehand_utils.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\FHParser.h

+SOURCE=..\..\src\lib\FHCollector.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\FHStringVector.h

+SOURCE=..\..\src\lib\FHParser.h

 # End Source File

 # Begin Source File