diff --git a/dictsource/de_list b/dictsource/de_list index dd4b7731..93b1d9da 100644 --- a/dictsource/de_list +++ b/dictsource/de_list @@ -420,8 +420,10 @@ arpeggier a*pEdZ'i:* arrangier a*aNZ'i:@ arterie $alt asphalt $2 -außerdem aUs3de:m +ausgeschamt aUsg@SA:mt +außerdem aUs3d'e:m aventurin avEntu:*'i:n +ave A:ve: avenue av@n'y: balkan $1 @@ -443,6 +445,7 @@ dahlie $alt deshalb $2 dezember $2 diadem di:ad'e:m +dient di:nt direkt $2 dividend di:vi:d'Ent dragier d@-*aZ'i:* diff --git a/dictsource/de_rules b/dictsource/de_rules index 4203d91a..fbb014b4 100644 --- a/dictsource/de_rules +++ b/dictsource/de_rules @@ -47,10 +47,17 @@ _) a (natioP1 'A: _) anath anat _) an (der an + _) angli (@ aNgli: + _) anglo (@ ,aNglo: + _) anheim (C@P6 anh'aIm + _) animal ,ani:mA:l + _) anim ,ani:m + _) ani (s %ani: _) anti (@P4 ,antI _) an (tw an _) auf (@P3 _!'aUf _) aus (@P3 _!'aUs + _) aus (ku aUs a (_ A: a (C_ A: @@ -58,10 +65,12 @@ @) a (bel_ 'A: s) a (g A: @l) a (g A: + schl) ag (ge A:k scl) a (g A: - sor) a (ch A: + spr) a (ch A: s) a (m_ A: s) a (mkeit A: + gr) a (mm_ 'a a (isier a _) achs (@P4 'aks _) achs (el 'aks @@ -97,7 +106,10 @@ a (tion a _) au (Ceinand aU _) aufent aUf@nt + austra (l %aUst@-*A _) authen aUtEn + ay (_ EI + p) ay EI .group b _) b (_ be: @@ -162,10 +174,9 @@ äu) ch C eu) ch C C) chen (_$4 C@n - ä) chen (_$4 C@n - e) chen (_$4 C@n -// i) chen (_$4 C@n - ü) chen (_$4 C@n + ä) chen (_ C@n + e) chen (_ C@n + ü) chen (_ C@n _) chr k@-* chs ks (_ @@ -201,6 +212,9 @@ dt t ddt t + _) darüber (@P7 da*'y:b@* + _) darum (@P5 da*'Um + _) darunter (@P8 da*'Unt@* _) daten (@P5 d'at@n _) deal _^_EN _) deme de:mE @@ -561,7 +575,7 @@ s) ien (_ 'i:@n t) ien (_ 'i:@n &) iens (_ =I;@ns - &) ient (_ I'Ent + ient (_ I'Ent &) ienz (_ I'Ents sch) ie (n i: @) ie (reX 'i: @@ -729,7 +743,6 @@ _) para (@ p,a*a passagie pasaZ'i: - _) pay _^_EN _) peri p,e:*i: _) perio p,e:*Io: _) periphe p,e:*i:fe: @@ -745,7 +758,7 @@ _) polik p'o:li:k _) po (lit p%o: pool _^_EN - power _^_EN + power paU@* _) preß (@P4 p@-*'Es _) prinzipien (@P9 p@-*Ints'i:pI@ _) privat (@P6 p@-*i:v'A:t @@ -768,6 +781,7 @@ _) rh @-* rangier @-*A:NZ'i:* + _) re (d re: .group s _) s (_ Es diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index ba446c81..390cf355 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -43,8 +43,9 @@ x z Dictionary de_dict 3 @ @- a A A: aI aU -E E2 E: e: I i2 i: O -o: OY U u: W y y: Y: +E E2 E: e: EI I i2 i: +O o: OY U u: W y y: +Y: * : ; b C C2 d D dZ f g h j k l m diff --git a/dictsource/en_list b/dictsource/en_list index b55b53c7..c761eafe 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -1881,6 +1881,7 @@ wicked wIkId wilderness wIld3nEs winding waIndI2N // verb wind waInd $verb +(wind up) w'aInd||'Vp winded wIndId winged wINd wither wID3 // not with+er diff --git a/phsource/compile_report b/phsource/compile_report index a1016fe1..b6f278fe 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -10,7 +10,7 @@ en_wm 30 144 af 38 128 cy 29 122 - de 31 122 + de 32 123 eo 13 108 fi 40 127 fr 32 118 @@ -318,7 +318,7 @@ 1 vdiph/au_3 en_rp 6 vdiph/au_4 base2 cy eo sk it is 1 vdiph/ee-e hi - 3 vdiph/eei en pt vi + 4 vdiph/eei en de pt vi 2 vdiph/eei_2 eo fi 3 vdiph/eei_3 en_us en_rp sk 1 vdiph/eei_4 nl diff --git a/phsource/ph_german b/phsource/ph_german index c99f8c09..c6d84248 100755 --- a/phsource/ph_german +++ b/phsource/ph_german @@ -138,6 +138,14 @@ phoneme aI endphoneme +phoneme EI + vowel starttype (e) endtype (i) + length 210 + formants vdiph/eei +endphoneme + + + phoneme OY vowel starttype (o) endtype (i) length 220 diff --git a/src/dictionary.cpp b/src/dictionary.cpp index 1d66f8a3..ce755739 100755 --- a/src/dictionary.cpp +++ b/src/dictionary.cpp @@ -2061,7 +2061,7 @@ void Translator::MatchRule(char *word[], const char *group, char *rule, MatchRec p -= utf8_in(&letter_w,p,1); } if(!failed) - match.points += (19-distance_left); + match.points += 3; } break; @@ -2106,7 +2106,7 @@ void Translator::MatchRule(char *word[], const char *group, char *rule, MatchRec if(letter == rb) { if(letter == RULE_SPACE) - match.points += 3; + match.points += 4; else match.points += (21-distance_left); } diff --git a/src/voices.cpp b/src/voices.cpp index d0b30ad0..ff317d26 100755 --- a/src/voices.cpp +++ b/src/voices.cpp @@ -52,7 +52,8 @@ int tone_points[10] = {600,170, 1200,135, 2000,110, 3000,110, -1,0}; // limit the rate of change for each formant number //static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate -static int formant_rate_22050[9] = {240, 180, 180, 180, 180, 180, 180, 180, 180}; // values for 22kHz sample rate +//static int formant_rate_22050[9] = {240, 180, 180, 180, 180, 180, 180, 180, 180}; // values for 22kHz sample rate +static int formant_rate_22050[9] = {240, 170, 170, 170, 170, 170, 170, 170, 170}; // values for 22kHz sample rate int formant_rate[9]; // values adjusted for actual sample rate diff --git a/windows/espeakedit/PAStaticWMME.lib b/windows/espeakedit/PAStaticWMME.lib new file mode 100755 index 00000000..6ddf5596 Binary files /dev/null and b/windows/espeakedit/PAStaticWMME.lib differ diff --git a/windows/espeakedit/ReadMe.txt b/windows/espeakedit/ReadMe.txt new file mode 100755 index 00000000..7976a6c2 --- /dev/null +++ b/windows/espeakedit/ReadMe.txt @@ -0,0 +1,11 @@ +Compiling the espeakedit program. + +Copy the source files into directory "src", but not overwrite files: + speech.h + StdAfx.h + +There are copies of these in directory "src_copy". + + +Use the "Unicode Release" build configuration. +This linkls with the "Unicode Release" version of the wxWidgets libraries. diff --git a/windows/espeakedit/espeakedit.dsp b/windows/espeakedit/espeakedit.dsp new file mode 100755 index 00000000..0ecd3fa4 --- /dev/null +++ b/windows/espeakedit/espeakedit.dsp @@ -0,0 +1,706 @@ +# Microsoft Developer Studio Project File - Name="minimal" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=minimal - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "espeakedit.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "espeakedit.mak" CFG="minimal - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "minimal - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 DLL Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "minimal - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "minimal - Win32 DLL Universal Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivudll\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivudll\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Universal Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivuddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivuddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivdll\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivdll\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswudll\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswudll\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswuddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswuddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswdll\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswdll\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswddll\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "WXUSINGDLL" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" +# ADD LINK32 wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "minimal - Win32 Universal Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivu\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivu\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Universal Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivud\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivud\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswuniv\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswuniv\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivd\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswunivd\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\minimal" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswu\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswu\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmsw28u_core.lib wxbase28u.lib wxmsw28u_adv.lib winmm.lib PAStaticWMME.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /out:"espeakedit.exe" /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\minimal" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswud\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswud\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_msw" +# PROP Intermediate_Dir "vc_msw\minimal" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_msw\minimal.pdb" /FD /EHsc /c +# ADD CPP /nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_msw\minimal.pdb" /FD /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "__WXMSW__" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmsw28_core.lib winmm.lib PAStaticWMME.lib wxbase28.lib wxmsw28_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "minimal - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\minimal" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswd" +# PROP Intermediate_Dir "vc_mswd\minimal" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswd\minimal.pdb" /FD /GZ /EHsc /c +# ADD CPP /nologo /MDd /W4 /Gm /GR /Zi /Od /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /Fd"vc_mswd\minimal.pdb" /FD /GZ /EHsc /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_WINDOWS" /d "NOPCH" +# ADD RSC /l 0x409 /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /i ".\..\..\samples" /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_WINDOWS" /d "NOPCH" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" +# ADD LINK32 wxmsw28d_core.lib winmm.lib PAStaticWMME.lib wxbase28d.lib wxmsw28d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:".\..\..\lib\vc_lib" + +!ENDIF + +# Begin Target + +# Name "minimal - Win32 DLL Universal Unicode Release" +# Name "minimal - Win32 DLL Universal Unicode Debug" +# Name "minimal - Win32 DLL Universal Release" +# Name "minimal - Win32 DLL Universal Debug" +# Name "minimal - Win32 DLL Unicode Release" +# Name "minimal - Win32 DLL Unicode Debug" +# Name "minimal - Win32 DLL Release" +# Name "minimal - Win32 DLL Debug" +# Name "minimal - Win32 Universal Unicode Release" +# Name "minimal - Win32 Universal Unicode Debug" +# Name "minimal - Win32 Universal Release" +# Name "minimal - Win32 Universal Debug" +# Name "minimal - Win32 Unicode Release" +# Name "minimal - Win32 Unicode Debug" +# Name "minimal - Win32 Release" +# Name "minimal - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\..\..\samples\sample.rc +# End Source File +# End Group +# Begin Source File + +SOURCE=.\src\compiledata.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\compiledict.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\debug.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\debug.h +# End Source File +# Begin Source File + +SOURCE=.\src\dictionary.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\espeak_command.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\espeak_command.h +# End Source File +# Begin Source File + +SOURCE=.\src\espeakedit.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\espeakedit.h +# End Source File +# Begin Source File + +SOURCE=.\src\event.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\event.h +# End Source File +# Begin Source File + +SOURCE=.\src\extras.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\fifo.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\fifo.h +# End Source File +# Begin Source File + +SOURCE=.\src\formantdlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\intonation.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\main.h +# End Source File +# Begin Source File + +SOURCE=.\src\menus.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\numbers.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\options.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\options.h +# End Source File +# Begin Source File + +SOURCE=.\src\phoneme.h +# End Source File +# Begin Source File + +SOURCE=.\src\phonemelist.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\portaudio.h +# End Source File +# Begin Source File + +SOURCE=.\src\portaudio18.h +# End Source File +# Begin Source File + +SOURCE=.\src\portaudio19.h +# End Source File +# Begin Source File + +SOURCE=.\src\prosodydisplay.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\prosodydisplay.h +# End Source File +# Begin Source File + +SOURCE=.\src\readclause.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\setlengths.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\sintab.h +# End Source File +# Begin Source File + +SOURCE=.\src\speak_lib.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\speak_lib.h +# End Source File +# Begin Source File + +SOURCE=.\src\spect.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\spect.h +# End Source File +# Begin Source File + +SOURCE=.\src\spectdisplay.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\spectseq.cpp +# End Source File +# Begin Source File + +SOURCE=.\include\speech.h +# End Source File +# Begin Source File + +SOURCE=.\speech.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=.\src\synth_mbrola.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\synthdata.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\synthesize.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\synthesize.h +# End Source File +# Begin Source File + +SOURCE=.\src\tr_english.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\tr_languages.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\tr_languages.h +# End Source File +# Begin Source File + +SOURCE=.\src\translate.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\translate.h +# End Source File +# Begin Source File + +SOURCE=.\src\transldlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\voice.h +# End Source File +# Begin Source File + +SOURCE=.\src\voicedlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\voices.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\vowelchart.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\wave.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\wave.h +# End Source File +# Begin Source File + +SOURCE=.\src\wavegen.cpp +# End Source File +# End Target +# End Project diff --git a/windows/espeakedit/espeakedit.dsw b/windows/espeakedit/espeakedit.dsw new file mode 100755 index 00000000..85424b1d --- /dev/null +++ b/windows/espeakedit/espeakedit.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "minimal"=".\espeakedit.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/windows/espeakedit/espeakedit.opt b/windows/espeakedit/espeakedit.opt new file mode 100755 index 00000000..834c6679 Binary files /dev/null and b/windows/espeakedit/espeakedit.opt differ diff --git a/windows/espeakedit/espeakedit.plg b/windows/espeakedit/espeakedit.plg new file mode 100755 index 00000000..1edae8e6 --- /dev/null +++ b/windows/espeakedit/espeakedit.plg @@ -0,0 +1,149 @@ + +
+++ + diff --git a/windows/espeakedit/mondrian.icns b/windows/espeakedit/mondrian.icns new file mode 100755 index 00000000..43fbff2c Binary files /dev/null and b/windows/espeakedit/mondrian.icns differ diff --git a/windows/espeakedit/mondros2.ico b/windows/espeakedit/mondros2.ico new file mode 100755 index 00000000..8b0e58c0 Binary files /dev/null and b/windows/espeakedit/mondros2.ico differ diff --git a/windows/espeakedit/src_copy/StdAfx.h b/windows/espeakedit/src_copy/StdAfx.h new file mode 100755 index 00000000..c9a526fd --- /dev/null +++ b/windows/espeakedit/src_copy/StdAfx.h @@ -0,0 +1,3 @@ +// This is a dummy file. +// A file of this name is needed on Windows + diff --git a/windows/espeakedit/src_copy/speech.h b/windows/espeakedit/src_copy/speech.h new file mode 100755 index 00000000..ae80a966 --- /dev/null +++ b/windows/espeakedit/src_copy/speech.h @@ -0,0 +1,79 @@ +/*************************************************************************** + * Copyright (C) 2005,2006 by Jonathan Duddington * + * jsd@clara.co.uk * + * * + * This program is free software; 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. * + ***************************************************************************/ + + +#define LOG_FRAMES // write keyframe info to src/log + +#define N_PEAKS 9 +#define N_MARKERS 8 + +// comment this out when compiling the "speak" process +//#define SPECT_EDITOR + +#includeBuild Log
++--------------------Configuration: minimal - Win32 Unicode Release-------------------- +
+Command Lines
+Creating command line "rc.exe /l 0x409 /fo"vc_mswu\minimal/sample.res" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /i ".\..\..\samples" /i "\wxWidgets-2.6.2\samples" /d "__WXMSW__" /d "_UNICODE" /d "_WINDOWS" /d "NOPCH" "C:\wxWidgets-2.6.2\samples\sample.rc"" +Creating temporary file "C:\DOCUME~1\JSD1~1.PC0\LOCALS~1\Temp\RSP64.tmp" with contents +[ +/nologo /MD /W4 /GR /O2 /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /Fo"vc_mswu\minimal/" /Fd"vc_mswu\minimal.pdb" /FD /EHsc /c +"C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledata.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\debug.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\espeak_command.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\espeakedit.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\event.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\extras.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\fifo.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\formantdlg.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\intonation.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\menus.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\numbers.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\options.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\phonemelist.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\prosodydisplay.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\readclause.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\setlengths.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\speak_lib.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\spect.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\spectdisplay.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\spectseq.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\synth_mbrola.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\synthdata.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\synthesize.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\tr_english.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\tr_languages.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\translate.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\transldlg.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\voicedlg.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\voices.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\vowelchart.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\wave.cpp" +"C:\wxWidgets-2.6.2\projects\espeakedit\src\wavegen.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\JSD1~1.PC0\LOCALS~1\Temp\RSP64.tmp" +Creating temporary file "C:\DOCUME~1\JSD1~1.PC0\LOCALS~1\Temp\RSP65.tmp" with contents +[ +wxmsw28u_core.lib wxbase28u.lib wxmsw28u_adv.lib winmm.lib PAStaticWMME.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /subsystem:windows /incremental:no /pdb:"vc_mswu/espeakedit.pdb" /machine:I386 /out:"espeakedit.exe" /libpath:".\..\..\lib\vc_lib" +".\vc_mswu\minimal\compiledata.obj" +".\vc_mswu\minimal\compiledict.obj" +".\vc_mswu\minimal\debug.obj" +".\vc_mswu\minimal\dictionary.obj" +".\vc_mswu\minimal\espeak_command.obj" +".\vc_mswu\minimal\espeakedit.obj" +".\vc_mswu\minimal\event.obj" +".\vc_mswu\minimal\extras.obj" +".\vc_mswu\minimal\fifo.obj" +".\vc_mswu\minimal\formantdlg.obj" +".\vc_mswu\minimal\intonation.obj" +".\vc_mswu\minimal\menus.obj" +".\vc_mswu\minimal\numbers.obj" +".\vc_mswu\minimal\options.obj" +".\vc_mswu\minimal\phonemelist.obj" +".\vc_mswu\minimal\prosodydisplay.obj" +".\vc_mswu\minimal\readclause.obj" +".\vc_mswu\minimal\setlengths.obj" +".\vc_mswu\minimal\speak_lib.obj" +".\vc_mswu\minimal\spect.obj" +".\vc_mswu\minimal\spectdisplay.obj" +".\vc_mswu\minimal\spectseq.obj" +".\vc_mswu\minimal\synth_mbrola.obj" +".\vc_mswu\minimal\synthdata.obj" +".\vc_mswu\minimal\synthesize.obj" +".\vc_mswu\minimal\tr_english.obj" +".\vc_mswu\minimal\tr_languages.obj" +".\vc_mswu\minimal\translate.obj" +".\vc_mswu\minimal\transldlg.obj" +".\vc_mswu\minimal\voicedlg.obj" +".\vc_mswu\minimal\voices.obj" +".\vc_mswu\minimal\vowelchart.obj" +".\vc_mswu\minimal\wave.obj" +".\vc_mswu\minimal\wavegen.obj" +".\vc_mswu\minimal\sample.res" +] +Creating command line "link.exe @C:\DOCUME~1\JSD1~1.PC0\LOCALS~1\Temp\RSP65.tmp" +Output Window
+Compiling resources... +Compiling... +compiledata.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +compiledict.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(205) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(218) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(341) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(354) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(379) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(384) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(586) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(615) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(621) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(668) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(670) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(731) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(732) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(733) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(867) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(1195) : warning C4244: '=' : conversion from 'unsigned int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\compiledict.cpp(1197) : warning C4244: '=' : conversion from 'unsigned int' to 'unsigned char', possible loss of data +debug.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +dictionary.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(256) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(398) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(442) : warning C4244: '=' : conversion from 'unsigned int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(458) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(588) : warning C4244: 'argument' : conversion from 'int' to 'unsigned short', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(636) : warning C4244: 'argument' : conversion from 'int' to 'unsigned short', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(875) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(886) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(1006) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(1066) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(1337) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(1533) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(1534) : warning C4244: '=' : conversion from 'int' to 'unsigned char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(1844) : warning C4244: 'argument' : conversion from 'int' to 'unsigned short', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2021) : warning C4244: 'argument' : conversion from 'int' to 'unsigned short', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2422) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2434) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2445) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2514) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2552) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +C:\wxWidgets-2.6.2\projects\espeakedit\src\dictionary.cpp(2557) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data +espeak_command.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +espeakedit.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +event.cpp +C:\wxWidgets-2.6.2\projects\espeakedit\src\speech.h(21) : error C2501: 'xxtest' : missing storage-class or type specifiers +extras.cpp +cl.exe terminated at user request. + +