From 86a72f98bf85f83ac65f497a2ef50b97e1b3b049 Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Sun, 3 Aug 2014 19:13:03 +0200 Subject: [PATCH] Update OLD build files for new gdoc.* source --- build/gmake/Makefile | 6 +++--- build/gnuauto/src/Makefile.am | 4 ++-- build/msvc/tidy.dsp | 8 ++++---- build/msvc/tidy.dsw | 12 ++++++++++++ build/msvc/tidylib.dsp | 4 ++-- build/msvc2010/tidydll.vcxproj | 9 ++++++++- build/msvc2010/tidylib.vcxproj | 10 +++++++++- 7 files changed, 40 insertions(+), 13 deletions(-) diff --git a/build/gmake/Makefile b/build/gmake/Makefile index 0209498..6d79840 100644 --- a/build/gmake/Makefile +++ b/build/gmake/Makefile @@ -139,7 +139,7 @@ OBJFILES=\ $(OBJDIR)/attrask$(OBJSUF) $(OBJDIR)/attrdict$(OBJSUF) $(OBJDIR)/attrget$(OBJSUF) \ $(OBJDIR)/buffio$(OBJSUF) $(OBJDIR)/fileio$(OBJSUF) $(OBJDIR)/streamio$(OBJSUF) \ $(OBJDIR)/tagask$(OBJSUF) $(OBJDIR)/tmbstr$(OBJSUF) $(OBJDIR)/utf8$(OBJSUF) \ - $(OBJDIR)/tidylib$(OBJSUF) $(OBJDIR)/mappedio$(OBJSUF) + $(OBJDIR)/tidylib$(OBJSUF) $(OBJDIR)/mappedio$(OBJSUF) $(OBJDIR)/gdoc$(OBJSUF) CFILES= \ $(SRCDIR)/access.c $(SRCDIR)/attrs.c $(SRCDIR)/istack.c \ @@ -149,7 +149,7 @@ CFILES= \ $(SRCDIR)/attrask.c $(SRCDIR)/attrdict.c $(SRCDIR)/attrget.c \ $(SRCDIR)/buffio.c $(SRCDIR)/fileio.c $(SRCDIR)/streamio.c \ $(SRCDIR)/tagask.c $(SRCDIR)/tmbstr.c $(SRCDIR)/utf8.c \ - $(SRCDIR)/tidylib.c $(SRCDIR)/mappedio.c + $(SRCDIR)/tidylib.c $(SRCDIR)/mappedio.c $(SRCDIR)/gdoc.c HFILES= $(INCDIR)/platform.h $(INCDIR)/tidy.h $(INCDIR)/tidyenum.h \ $(INCDIR)/buffio.h @@ -161,7 +161,7 @@ LIBHFILES= \ $(SRCDIR)/mappedio.h $(SRCDIR)/message.h $(SRCDIR)/parser.h \ $(SRCDIR)/pprint.h $(SRCDIR)/streamio.h $(SRCDIR)/tags.h \ $(SRCDIR)/tmbstr.h $(SRCDIR)/utf8.h $(SRCDIR)/tidy-int.h \ - $(SRCDIR)/version.h + $(SRCDIR)/gdoc.h $(SRCDIR)/version.h diff --git a/build/gnuauto/src/Makefile.am b/build/gnuauto/src/Makefile.am index 571ba85..db315fc 100644 --- a/build/gnuauto/src/Makefile.am +++ b/build/gnuauto/src/Makefile.am @@ -59,7 +59,7 @@ libtidy_la_SOURCES = \ clean.c localize.c config.c alloc.c \ attrask.c attrdict.c attrget.c buffio.c \ fileio.c streamio.c tagask.c tmbstr.c \ - utf8.c tidylib.c mappedio.c + utf8.c tidylib.c mappedio.c gdoc.c libtidy_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ @@ -70,6 +70,6 @@ HFILES = \ config.h entities.h fileio.h forward.h \ lexer.h mappedio.h message.h parser.h \ pprint.h streamio.h tags.h tmbstr.h \ - utf8.h tidy-int.h version.h + utf8.h tidy-int.h version.h gdoc.h EXTRA_DIST = $(HFILES) diff --git a/build/msvc/tidy.dsp b/build/msvc/tidy.dsp index cb0aa68..f405688 100644 --- a/build/msvc/tidy.dsp +++ b/build/msvc/tidy.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D _CRT_SECURE_NO_DEPRECATE /YX /FD /c +# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D _CRT_SECURE_NO_DEPRECATE /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:console /profile /map /machine:I386 /out:bin\tidy.exe +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:console /profile /map /machine:I386 !ELSEIF "$(CFG)" == "tidy - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D _CRT_SECURE_NO_DEPRECATE /YX /FD /GZ /c +# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D _CRT_SECURE_NO_DEPRECATE /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:console /debug /machine:I386 /pdbtype:sept /out:bin\tidyd.exe +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/build/msvc/tidy.dsw b/build/msvc/tidy.dsw index 1a38106..0567970 100644 --- a/build/msvc/tidy.dsw +++ b/build/msvc/tidy.dsw @@ -18,6 +18,18 @@ Package=<4> ############################################################################### +Project: "tidydll"=.\tidydll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "tidylib"=.\tidylib.dsp - Package Owner=<4> Package=<5> diff --git a/build/msvc/tidylib.dsp b/build/msvc/tidylib.dsp index 08673e6..3e9dd65 100644 --- a/build/msvc/tidylib.dsp +++ b/build/msvc/tidylib.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"lib\libtidy.lib" +# ADD LIB32 /nologo /out:"Release\libtidy.lib" !ELSEIF "$(CFG)" == "tidylib - Win32 Debug" @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"lib\libtidyd.lib" +# ADD LIB32 /nologo /out:"Debug\libtidy.lib" !ENDIF diff --git a/build/msvc2010/tidydll.vcxproj b/build/msvc2010/tidydll.vcxproj index 7dcaf64..7d77b5c 100644 --- a/build/msvc2010/tidydll.vcxproj +++ b/build/msvc2010/tidydll.vcxproj @@ -273,6 +273,12 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + @@ -302,8 +308,9 @@ + - \ No newline at end of file + diff --git a/build/msvc2010/tidylib.vcxproj b/build/msvc2010/tidylib.vcxproj index f855c05..7116907 100644 --- a/build/msvc2010/tidylib.vcxproj +++ b/build/msvc2010/tidylib.vcxproj @@ -270,6 +270,13 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(UndefinePreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + @@ -296,8 +303,9 @@ + - \ No newline at end of file +