From ca8660193b5e4a74f8f79817de12be87a4ff3078 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 23 Oct 2002 22:24:33 +0000 Subject: [PATCH] reorg share directory, split each lib into its own dir --- src/share/Makefile.am | 42 ++++++++++++--------------- src/share/Makefile.lite | 42 --------------------------- src/share/Makefile.vc | 44 +++++++++-------------------- src/share/getopt/Makefile.am | 20 +++++++++++++ src/share/getopt/Makefile.lite | 16 +++++++++++ src/share/getopt/Makefile.vc | 24 ++++++++++++++++ src/share/{ => getopt}/getopt.c | 0 src/share/{ => getopt}/getopt.dsp | 16 +++++------ src/share/{ => getopt}/getopt1.c | 0 src/share/utf8/Makefile.am | 25 ++++++++++++++++ src/share/utf8/Makefile.lite | 17 +++++++++++ src/share/utf8/Makefile.vc | 25 ++++++++++++++++ src/share/{ => utf8}/charmaps.h | 0 src/share/{ => utf8}/charset.c | 0 src/share/{ => utf8}/charset.h | 0 src/share/{ => utf8}/charset_test.c | 0 src/share/{ => utf8}/charsetmap.h | 0 src/share/{ => utf8}/iconvert.c | 0 src/share/{ => utf8}/makemap.c | 0 src/share/{ => utf8}/utf8.c | 0 src/share/{ => utf8}/utf8.dsp | 16 +++++------ 21 files changed, 175 insertions(+), 112 deletions(-) delete mode 100644 src/share/Makefile.lite create mode 100644 src/share/getopt/Makefile.am create mode 100644 src/share/getopt/Makefile.lite create mode 100644 src/share/getopt/Makefile.vc rename src/share/{ => getopt}/getopt.c (100%) rename src/share/{ => getopt}/getopt.dsp (84%) rename src/share/{ => getopt}/getopt1.c (100%) create mode 100644 src/share/utf8/Makefile.am create mode 100644 src/share/utf8/Makefile.lite create mode 100644 src/share/utf8/Makefile.vc rename src/share/{ => utf8}/charmaps.h (100%) rename src/share/{ => utf8}/charset.c (100%) rename src/share/{ => utf8}/charset.h (100%) rename src/share/{ => utf8}/charset_test.c (100%) rename src/share/{ => utf8}/charsetmap.h (100%) rename src/share/{ => utf8}/iconvert.c (100%) rename src/share/{ => utf8}/makemap.c (100%) rename src/share/{ => utf8}/utf8.c (100%) rename src/share/{ => utf8}/utf8.dsp (84%) diff --git a/src/share/Makefile.am b/src/share/Makefile.am index 23890cc5..79646376 100644 --- a/src/share/Makefile.am +++ b/src/share/Makefile.am @@ -1,28 +1,22 @@ -## Process this file with automake to produce Makefile.in +# FLAC - Free Lossless Audio Codec +# Copyright (C) 2002 Josh Coalson +# +# This program is part of FLAC; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AUTOMAKE_OPTIONS = foreign - -INCLUDES = -I$(top_srcdir)/include/share - -noinst_LIBRARIES = libutf8.a libgetopt.a - -libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c - -libgetopt_a_SOURCES = getopt.c getopt1.c +SUBDIRS = getopt utf8 EXTRA_DIST = \ - Makefile.lite \ Makefile.vc \ - README \ - charmaps.h \ - makemap.c \ - charset_test.c \ - charsetmap.h \ - getopt.dsp \ - utf8.dsp - -debug: - $(MAKE) all CFLAGS="@DEBUG@" - -profile: - $(MAKE) all CFLAGS="@PROFILE@" + README diff --git a/src/share/Makefile.lite b/src/share/Makefile.lite deleted file mode 100644 index 3ac74d05..00000000 --- a/src/share/Makefile.lite +++ /dev/null @@ -1,42 +0,0 @@ -# -# GNU makefile -# - -topdir = ../.. - -LIB_NAME = libgetopt -INCLUDES = -I$(topdir)/include -I$(topdir)/include/share - -OBJS = \ - getopt.o \ - getopt1.o - -include $(topdir)/build/lib.mk - -# Our lame Makefile.lite system has no provision for building multiple libs in -# a directory, so we hack it: -UTF8_LIB_NAME = libutf8 -UTF8_OBJS = charset.o iconvert.o utf8.o -UTF8_STATIC_LIB = $(LIBPATH)/$(UTF8_LIB_NAME).$(STATIC_LIB_SUFFIX) -UTF8_DYNAMIC_LIB = $(LIBPATH)/$(UTF8_LIB_NAME).$(DYNAMIC_LIB_SUFFIX) - -debug: $(UTF8_STATIC_LIB) $(UTF8_DYNAMIC_LIB) - -release: $(UTF8_STATIC_LIB) $(UTF8_DYNAMIC_LIB) - -clean: utf8_clean - -utf8_clean: - rm -f $(UTF8_OBJS) $(UTF8_STATIC_LIB) $(UTF8_DYNAMIC_LIB) - -$(UTF8_STATIC_LIB): $(UTF8_OBJS) - $(LINK) $@ $(UTF8_OBJS) && ranlib $@ - -$(UTF8_DYNAMIC_LIB): $(UTF8_OBJS) -ifeq ($(DARWIN_BUILD),yes) - $(LINKD) -o $@ $(UTF8_OBJS) $(LFLAGS) $(LIBS) -lc -else - $(LINKD) -o $@ $(UTF8_OBJS) $(LFLAGS) $(LIBS) -endif - -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/src/share/Makefile.vc b/src/share/Makefile.vc index 15f9c3ac..d6979209 100644 --- a/src/share/Makefile.vc +++ b/src/share/Makefile.vc @@ -1,35 +1,19 @@ !include -!IFDEF DEBUG -.c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< -!else -.c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX -DNODEBUG $< -!endif +# It's less hassle to spell it all out that to figure out how to do it right with nmake: -C_FILES= \ - getopt.c \ - getopt1.c - -UTF8_C_FILES= \ - charset.c \ - iconvert.c \ - utf8.c - -OBJS= $(C_FILES:.c=.obj) - -UTF8_OBJS= $(UTF8_C_FILES:.c=.obj) - -all: getopt.lib utf8.lib - -getopt.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) - -utf8.lib: $(UTF8_OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(UTF8_OBJS) +all: + cd getopt + nmake /f Makefile.vc + cd .. + cd utf8 + nmake /f Makefile.vc + cd .. clean: - -del *.obj *.pch - -del ..\..\obj\lib\getopt.lib ..\..\obj\lib\getopt.pdb - -del ..\..\obj\lib\utf8.lib ..\..\obj\lib\utf8.pdb + cd getopt + nmake /f Makefile.vc clean + cd .. + cd utf8 + nmake /f Makefile.vc clean + cd .. diff --git a/src/share/getopt/Makefile.am b/src/share/getopt/Makefile.am new file mode 100644 index 00000000..1636f91d --- /dev/null +++ b/src/share/getopt/Makefile.am @@ -0,0 +1,20 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +INCLUDES = -I$(top_srcdir)/include/share + +noinst_LIBRARIES = libgetopt.a + +libgetopt_a_SOURCES = getopt.c getopt1.c + +EXTRA_DIST = \ + Makefile.lite \ + Makefile.vc \ + getopt.dsp + +debug: + $(MAKE) all CFLAGS="@DEBUG@" + +profile: + $(MAKE) all CFLAGS="@PROFILE@" diff --git a/src/share/getopt/Makefile.lite b/src/share/getopt/Makefile.lite new file mode 100644 index 00000000..41204035 --- /dev/null +++ b/src/share/getopt/Makefile.lite @@ -0,0 +1,16 @@ +# +# GNU makefile +# + +topdir = ../../.. + +LIB_NAME = libgetopt +INCLUDES = -I$(topdir)/include -I$(topdir)/include/share + +OBJS = \ + getopt.o \ + getopt1.o + +include $(topdir)/build/lib.mk + +# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/src/share/getopt/Makefile.vc b/src/share/getopt/Makefile.vc new file mode 100644 index 00000000..0f1a51d1 --- /dev/null +++ b/src/share/getopt/Makefile.vc @@ -0,0 +1,24 @@ +!include + +!IFDEF DEBUG +.c.obj: + $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< +!else +.c.obj: + $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< +!endif + +C_FILES= \ + getopt.c \ + getopt1.c + +OBJS= $(C_FILES:.c=.obj) + +all: getopt.lib + +getopt.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(OBJS) + +clean: + -del *.obj *.pch + -del ..\..\..\obj\lib\getopt.lib ..\..\..\obj\lib\getopt.pdb diff --git a/src/share/getopt.c b/src/share/getopt/getopt.c similarity index 100% rename from src/share/getopt.c rename to src/share/getopt/getopt.c diff --git a/src/share/getopt.dsp b/src/share/getopt/getopt.dsp similarity index 84% rename from src/share/getopt.dsp rename to src/share/getopt/getopt.dsp index c45e3c8c..f092ab22 100644 --- a/src/share/getopt.dsp +++ b/src/share/getopt/getopt.dsp @@ -24,7 +24,7 @@ CFG=getopt - Win32 Debug # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "getopt" -# PROP Scc_LocalPath "..\.." +# PROP Scc_LocalPath "..\..\.." CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\lib" +# PROP Output_Dir "..\..\..\obj\lib" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\..\include" /D "NDEBUG" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +53,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 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/getopt.dll" +# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\obj\bin/getopt.dll" !ELSEIF "$(CFG)" == "getopt - Win32 Debug" @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\lib" +# PROP Output_Dir "..\..\..\obj\lib" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "_CHATTER" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "_DEBUG" /D "_CHATTER" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -79,7 +79,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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/getopt.dll" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\obj\bin/getopt.dll" /pdbtype:sept !ENDIF @@ -112,7 +112,7 @@ SOURCE=.\getopt1.c # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\share\getopt.h +SOURCE=..\..\..\include\share\getopt.h # End Source File # End Group # End Target diff --git a/src/share/getopt1.c b/src/share/getopt/getopt1.c similarity index 100% rename from src/share/getopt1.c rename to src/share/getopt/getopt1.c diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am new file mode 100644 index 00000000..dbe2287f --- /dev/null +++ b/src/share/utf8/Makefile.am @@ -0,0 +1,25 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +INCLUDES = -I$(top_srcdir)/include/share + +noinst_LIBRARIES = libutf8.a + +libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c + +EXTRA_DIST = \ + Makefile.lite \ + Makefile.vc \ + README \ + charmaps.h \ + makemap.c \ + charset_test.c \ + charsetmap.h \ + utf8.dsp + +debug: + $(MAKE) all CFLAGS="@DEBUG@" + +profile: + $(MAKE) all CFLAGS="@PROFILE@" diff --git a/src/share/utf8/Makefile.lite b/src/share/utf8/Makefile.lite new file mode 100644 index 00000000..6ffa3b23 --- /dev/null +++ b/src/share/utf8/Makefile.lite @@ -0,0 +1,17 @@ +# +# GNU makefile +# + +topdir = ../../.. + +LIB_NAME = libutf8 +INCLUDES = -I$(topdir)/include -I$(topdir)/include/share + +OBJS = \ + charset.o \ + iconvert.o \ + utf8.o + +include $(topdir)/build/lib.mk + +# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/src/share/utf8/Makefile.vc b/src/share/utf8/Makefile.vc new file mode 100644 index 00000000..2fa8a872 --- /dev/null +++ b/src/share/utf8/Makefile.vc @@ -0,0 +1,25 @@ +!include + +!IFDEF DEBUG +.c.obj: + $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< +!else +.c.obj: + $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< +!endif + +C_FILES= \ + charset.c \ + iconvert.c \ + utf8.c + +OBJS= $(C_FILES:.c=.obj) + +all: utf8.lib + +utf8.lib: $(UTF8_OBJS) + link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(UTF8_OBJS) + +clean: + -del *.obj *.pch + -del ..\..\..\obj\lib\utf8.lib ..\..\..\obj\lib\utf8.pdb diff --git a/src/share/charmaps.h b/src/share/utf8/charmaps.h similarity index 100% rename from src/share/charmaps.h rename to src/share/utf8/charmaps.h diff --git a/src/share/charset.c b/src/share/utf8/charset.c similarity index 100% rename from src/share/charset.c rename to src/share/utf8/charset.c diff --git a/src/share/charset.h b/src/share/utf8/charset.h similarity index 100% rename from src/share/charset.h rename to src/share/utf8/charset.h diff --git a/src/share/charset_test.c b/src/share/utf8/charset_test.c similarity index 100% rename from src/share/charset_test.c rename to src/share/utf8/charset_test.c diff --git a/src/share/charsetmap.h b/src/share/utf8/charsetmap.h similarity index 100% rename from src/share/charsetmap.h rename to src/share/utf8/charsetmap.h diff --git a/src/share/iconvert.c b/src/share/utf8/iconvert.c similarity index 100% rename from src/share/iconvert.c rename to src/share/utf8/iconvert.c diff --git a/src/share/makemap.c b/src/share/utf8/makemap.c similarity index 100% rename from src/share/makemap.c rename to src/share/utf8/makemap.c diff --git a/src/share/utf8.c b/src/share/utf8/utf8.c similarity index 100% rename from src/share/utf8.c rename to src/share/utf8/utf8.c diff --git a/src/share/utf8.dsp b/src/share/utf8/utf8.dsp similarity index 84% rename from src/share/utf8.dsp rename to src/share/utf8/utf8.dsp index effbc825..dd2e3ebc 100644 --- a/src/share/utf8.dsp +++ b/src/share/utf8/utf8.dsp @@ -24,7 +24,7 @@ CFG=utf8 - Win32 Debug # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "utf8" -# PROP Scc_LocalPath "..\.." +# PROP Scc_LocalPath "..\..\.." CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\lib" +# PROP Output_Dir "..\..\..\obj\lib" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include\share" /D "NDEBUG" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\..\include\share" /D "NDEBUG" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +53,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 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/utf8.dll" +# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\obj\bin/utf8.dll" !ELSEIF "$(CFG)" == "utf8 - Win32 Debug" @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\lib" +# PROP Output_Dir "..\..\..\obj\lib" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include\share" /D "_DEBUG" /D "_CHATTER" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "_DEBUG" /D "_CHATTER" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -79,7 +79,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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/utf8.dll" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\obj\bin/utf8.dll" /pdbtype:sept !ENDIF @@ -116,7 +116,7 @@ SOURCE=.\utf8.c # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\share\utf8.h +SOURCE=..\..\..\include\share\utf8.h # End Source File # End Group # End Target