diff --git a/projects/770.dsp b/projects/770.dsp index 4bad90735..7663cc462 100755 --- a/projects/770.dsp +++ b/projects/770.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/770.rc b/projects/770.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/770.rc +++ b/projects/770.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/771mod.dsp b/projects/771mod.dsp index 14cce5402..756dcbe4b 100755 --- a/projects/771mod.dsp +++ b/projects/771mod.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/771mod.rc b/projects/771mod.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/771mod.rc +++ b/projects/771mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/772mod.dsp b/projects/772mod.dsp index 29fe7cd59..cd59fc7d7 100755 --- a/projects/772mod.dsp +++ b/projects/772mod.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/772mod.rc b/projects/772mod.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/772mod.rc +++ b/projects/772mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/773mod.dsp b/projects/773mod.dsp index cecf7b219..f485c5ecb 100755 --- a/projects/773mod.dsp +++ b/projects/773mod.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/773mod.rc b/projects/773mod.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/773mod.rc +++ b/projects/773mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/774.dsp b/projects/774.dsp index 2dd1c9c4a..a60744f64 100755 --- a/projects/774.dsp +++ b/projects/774.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/774.rc b/projects/774.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/774.rc +++ b/projects/774.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/775.dsp b/projects/775.dsp index 66ad72ce0..eab61e9b8 100755 --- a/projects/775.dsp +++ b/projects/775.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/775.rc b/projects/775.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/775.rc +++ b/projects/775.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/776mod.dsp b/projects/776mod.dsp index cb6691645..4d4ff04d2 100755 --- a/projects/776mod.dsp +++ b/projects/776mod.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/776mod.rc b/projects/776mod.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/776mod.rc +++ b/projects/776mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/777.dsp b/projects/777.dsp index f2fab3a06..509f9cc64 100755 --- a/projects/777.dsp +++ b/projects/777.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/777.rc b/projects/777.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/777.rc +++ b/projects/777.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/77cnv.dsp b/projects/77cnv.dsp index dd0c965f5..8e1d4acbb 100755 --- a/projects/77cnv.dsp +++ b/projects/77cnv.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/77cnv.rc b/projects/77cnv.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/77cnv.rc +++ b/projects/77cnv.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/Cacnv.dsp b/projects/Cacnv.dsp index 940824302..41b15bf02 100755 --- a/projects/Cacnv.dsp +++ b/projects/Cacnv.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Cgp0.dsp b/projects/Cgp0.dsp index 02670760f..ca4925b44 100755 --- a/projects/Cgp0.dsp +++ b/projects/Cgp0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Cgp1.dsp b/projects/Cgp1.dsp index 8f75bbc1b..1291560fa 100755 --- a/projects/Cgp1.dsp +++ b/projects/Cgp1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Cgp2.dsp b/projects/Cgp2.dsp index 22be49dc5..518257e1b 100755 --- a/projects/Cgp2.dsp +++ b/projects/Cgp2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Cgp3.dsp b/projects/Cgp3.dsp index 231598642..fa81cb418 100755 --- a/projects/Cgp3.dsp +++ b/projects/Cgp3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Dl0.dsp b/projects/Dl0.dsp index d7365e16b..bddbad37e 100755 --- a/projects/Dl0.dsp +++ b/projects/Dl0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Dlinst.dsp b/projects/Dlinst.dsp index 5b2dbd24a..4f54356ac 100755 --- a/projects/Dlinst.dsp +++ b/projects/Dlinst.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/InstallShield.dsp b/projects/InstallShield.dsp index 1f9bbcf01..b4fb18db7 100755 --- a/projects/InstallShield.dsp +++ b/projects/InstallShield.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/Si0.dsp b/projects/Si0.dsp index cf2c38c6b..c9cb655be 100755 --- a/projects/Si0.dsp +++ b/projects/Si0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ab0.dsp b/projects/ab0.dsp index eccc3493f..7e93636a3 100755 --- a/projects/ab0.dsp +++ b/projects/ab0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ab0.rc b/projects/ab0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ab0.rc +++ b/projects/ab0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ab1.dsp b/projects/ab1.dsp index 72c4d21a9..1b8a89956 100755 --- a/projects/ab1.dsp +++ b/projects/ab1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ab1.rc b/projects/ab1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ab1.rc +++ b/projects/ab1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ab2.dsp b/projects/ab2.dsp index 85c76d609..0e267658e 100755 --- a/projects/ab2.dsp +++ b/projects/ab2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ab2.rc b/projects/ab2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ab2.rc +++ b/projects/ab2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ab3.dsp b/projects/ab3.dsp index ab78c7c1e..22ffd1852 100755 --- a/projects/ab3.dsp +++ b/projects/ab3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ab3.rc b/projects/ab3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ab3.rc +++ b/projects/ab3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/agalib.dsp b/projects/agalib.dsp index a03162f13..78bf5b926 100755 --- a/projects/agalib.dsp +++ b/projects/agalib.dsp @@ -40,10 +40,10 @@ RSC=rc.exe # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\Release\Lib" # PROP Target_Dir "" +WxLib32=link.exe -lib AgaLib=link.exe -lib # ADD BASE AgaLib /nologo # ADD AgaLib /nologo -WxLib32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MT /W3 /O2 /I "..\xvaga" /I "..\xi" /I "..\include" /I "..\gfm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "CB6" /FR /YX /FD /c # ADD BASE RSC /l 0x410 @@ -65,10 +65,10 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Debug/DebugLib" # PROP Target_Dir "" +WxLib32=link.exe -lib AgaLib=link.exe -lib # ADD BASE AgaLib /nologo # ADD AgaLib /nologo -WxLib32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\xvaga" /I "..\xi" /I "..\include" /I "..\gfm" /D "_DEBUG" /D "DBG" /D "TRC" /D "WIN32" /D "_WINDOWS" /FR /FD /c # SUBTRACT CPP /YX diff --git a/projects/authoriz.dsp b/projects/authoriz.dsp index 769996fbf..db2408c08 100755 --- a/projects/authoriz.dsp +++ b/projects/authoriz.dsp @@ -50,7 +50,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -72,18 +72,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exed/servers/Authoriz.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exed/servers/Authoriz.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "Authoriz - Win32 Debug DLL" @@ -99,18 +99,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Authoriz.exe" /pdbtype:sept /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Authoriz.exe" /pdbtype:sept /libpath:"..\..\wx280\lib" !ELSEIF "$(CFG)" == "Authoriz - Win32 Release DLL" @@ -126,18 +126,18 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Authoriz.exe" /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Authoriz.exe" /libpath:"..\..\wx280\lib" !ENDIF @@ -206,16 +206,16 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Authoriz - Win32 Debug DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Release\A_02_02\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Release\A_02_02\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Release\A_02_02\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ELSEIF "$(CFG)" == "Authoriz - Win32 Release DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Release\A_02_02\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Release\A_02_02\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Release\A_02_02\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ENDIF @@ -230,7 +230,7 @@ SOURCE=..\Lib\hlw32_mc.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\wxmsw263d.lib !IF "$(CFG)" == "Authoriz - Win32 Release" @@ -247,7 +247,7 @@ SOURCE=..\..\wx263\lib\wxmsw263d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "Authoriz - Win32 Release" diff --git a/projects/ba0.dsp b/projects/ba0.dsp index fa0cda9b0..65055c27a 100755 --- a/projects/ba0.dsp +++ b/projects/ba0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba0.rc b/projects/ba0.rc index 54964ba0f..25fcb7702 100755 --- a/projects/ba0.rc +++ b/projects/ba0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/campo.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba1.dsp b/projects/ba1.dsp index e561f8b88..429fabab1 100755 --- a/projects/ba1.dsp +++ b/projects/ba1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba1.rc b/projects/ba1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba1.rc +++ b/projects/ba1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba2.dsp b/projects/ba2.dsp index d93dc01cd..5a7ad6308 100755 --- a/projects/ba2.dsp +++ b/projects/ba2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba2.rc b/projects/ba2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba2.rc +++ b/projects/ba2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba3.dsp b/projects/ba3.dsp index e8edef15b..e3aaaf423 100755 --- a/projects/ba3.dsp +++ b/projects/ba3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba3.rc b/projects/ba3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba3.rc +++ b/projects/ba3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba4.dsp b/projects/ba4.dsp index aa83dd8a2..bb0a124b7 100755 --- a/projects/ba4.dsp +++ b/projects/ba4.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba4.rc b/projects/ba4.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba4.rc +++ b/projects/ba4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba5.dsp b/projects/ba5.dsp index 3e9acd011..8c8ddc250 100755 --- a/projects/ba5.dsp +++ b/projects/ba5.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba5.rc b/projects/ba5.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba5.rc +++ b/projects/ba5.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba6.dsp b/projects/ba6.dsp index a61ce84b1..65571598b 100755 --- a/projects/ba6.dsp +++ b/projects/ba6.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba6.rc b/projects/ba6.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba6.rc +++ b/projects/ba6.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba7.dsp b/projects/ba7.dsp index 0c46410dc..072a9e2b1 100755 --- a/projects/ba7.dsp +++ b/projects/ba7.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba7.rc b/projects/ba7.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba7.rc +++ b/projects/ba7.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ba8.dsp b/projects/ba8.dsp index 656519248..0faaec135 100755 --- a/projects/ba8.dsp +++ b/projects/ba8.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ba8.rc b/projects/ba8.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ba8.rc +++ b/projects/ba8.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/bacnv.dsp b/projects/bacnv.dsp index 98b53ad29..c283a9bda 100755 --- a/projects/bacnv.dsp +++ b/projects/bacnv.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/bacnv.rc b/projects/bacnv.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/bacnv.rc +++ b/projects/bacnv.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/bainst.rc b/projects/bainst.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/bainst.rc +++ b/projects/bainst.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/baseserv.dsp b/projects/baseserv.dsp index 89306cdb2..1141d40b1 100755 --- a/projects/baseserv.dsp +++ b/projects/baseserv.dsp @@ -50,7 +50,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -72,18 +72,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/server.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/server.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "BaseServ - Win32 Debug DLL" @@ -99,18 +99,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /fo"..\server\DebugDLL/server.res" /i "..\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /fo"..\server\DebugDLL/server.res" /i "..\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/BaseServ.exe" /pdbtype:sept /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/BaseServ.exe" /pdbtype:sept /libpath:"..\..\wx280\lib" !ELSEIF "$(CFG)" == "BaseServ - Win32 Release DLL" @@ -126,18 +126,18 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/BaseServ.exe" /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/BaseServ.exe" /libpath:"..\..\wx280\lib" !ENDIF @@ -177,7 +177,7 @@ SOURCE=.\xml.h # End Group # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\wxmsw263d.lib !IF "$(CFG)" == "BaseServ - Win32 Release" @@ -194,7 +194,7 @@ SOURCE=..\..\wx263\lib\wxmsw263d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "BaseServ - Win32 Release" diff --git a/projects/ca0.dsp b/projects/ca0.dsp index eb7e5e0fd..0a72961c5 100755 --- a/projects/ca0.dsp +++ b/projects/ca0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ca0.rc b/projects/ca0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ca0.rc +++ b/projects/ca0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ca1.dsp b/projects/ca1.dsp index 6b4865fb6..1169289f3 100755 --- a/projects/ca1.dsp +++ b/projects/ca1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ca1.rc b/projects/ca1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ca1.rc +++ b/projects/ca1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ca2.dsp b/projects/ca2.dsp index 02e6e52f8..3fdbfb7f6 100755 --- a/projects/ca2.dsp +++ b/projects/ca2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ca2.rc b/projects/ca2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ca2.rc +++ b/projects/ca2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ca3.dsp b/projects/ca3.dsp index 8c1e2fcf6..fb588afbc 100755 --- a/projects/ca3.dsp +++ b/projects/ca3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ca3.rc b/projects/ca3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ca3.rc +++ b/projects/ca3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cacnv.rc b/projects/cacnv.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cacnv.rc +++ b/projects/cacnv.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ce0.dsp b/projects/ce0.dsp index 9ccf809d3..6cd865004 100755 --- a/projects/ce0.dsp +++ b/projects/ce0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ce0.rc b/projects/ce0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ce0.rc +++ b/projects/ce0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ce1.dsp b/projects/ce1.dsp index e6277eec8..882d92673 100755 --- a/projects/ce1.dsp +++ b/projects/ce1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ce1.rc b/projects/ce1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ce1.rc +++ b/projects/ce1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ce2.dsp b/projects/ce2.dsp index 3a41f6d58..d701dca50 100755 --- a/projects/ce2.dsp +++ b/projects/ce2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ce2.rc b/projects/ce2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ce2.rc +++ b/projects/ce2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ce3.dsp b/projects/ce3.dsp index 8e24997b2..46ba16b2b 100755 --- a/projects/ce3.dsp +++ b/projects/ce3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ce3.rc b/projects/ce3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ce3.rc +++ b/projects/ce3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ce4.dsp b/projects/ce4.dsp index 0f4cbf1f3..90d5fb994 100755 --- a/projects/ce4.dsp +++ b/projects/ce4.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ce4.rc b/projects/ce4.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ce4.rc +++ b/projects/ce4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg0.dsp b/projects/cg0.dsp index a475a518f..1d6da39b6 100755 --- a/projects/cg0.dsp +++ b/projects/cg0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg0.rc b/projects/cg0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg0.rc +++ b/projects/cg0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg1.dsp b/projects/cg1.dsp index 26d480a9a..d8c6fa34c 100755 --- a/projects/cg1.dsp +++ b/projects/cg1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg1.rc b/projects/cg1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg1.rc +++ b/projects/cg1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg2.dsp b/projects/cg2.dsp index 208e6ec5a..fe9d11a66 100755 --- a/projects/cg2.dsp +++ b/projects/cg2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg2.rc b/projects/cg2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg2.rc +++ b/projects/cg2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg3.dsp b/projects/cg3.dsp index d953b8a64..e6d4d925c 100755 --- a/projects/cg3.dsp +++ b/projects/cg3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg3.rc b/projects/cg3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg3.rc +++ b/projects/cg3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg4.dsp b/projects/cg4.dsp index 2d43dd304..5064cc83b 100755 --- a/projects/cg4.dsp +++ b/projects/cg4.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg4.rc b/projects/cg4.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg4.rc +++ b/projects/cg4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg5.dsp b/projects/cg5.dsp index a3d1bf451..5382cec43 100755 --- a/projects/cg5.dsp +++ b/projects/cg5.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg5.rc b/projects/cg5.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg5.rc +++ b/projects/cg5.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg6.dsp b/projects/cg6.dsp index 545f543d1..cd1b997a6 100755 --- a/projects/cg6.dsp +++ b/projects/cg6.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cg6.rc b/projects/cg6.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg6.rc +++ b/projects/cg6.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cg7.rc b/projects/cg7.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cg7.rc +++ b/projects/cg7.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cgp0.rc b/projects/cgp0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cgp0.rc +++ b/projects/cgp0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cgp1.rc b/projects/cgp1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cgp1.rc +++ b/projects/cgp1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cgp2.rc b/projects/cgp2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cgp2.rc +++ b/projects/cgp2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cgp3.rc b/projects/cgp3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cgp3.rc +++ b/projects/cgp3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cgp4.rc b/projects/cgp4.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cgp4.rc +++ b/projects/cgp4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ci0.dsp b/projects/ci0.dsp index ddda266b2..785b7a0ec 100755 --- a/projects/ci0.dsp +++ b/projects/ci0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ci0.rc b/projects/ci0.rc index 1e303bf40..fa51c2379 100755 --- a/projects/ci0.rc +++ b/projects/ci0.rc @@ -1,3 +1,3 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc \ No newline at end of file +rcinclude ../../wx280/include/wx/msw/wx.rc \ No newline at end of file diff --git a/projects/ci1.rc b/projects/ci1.rc index 1e303bf40..fa51c2379 100755 --- a/projects/ci1.rc +++ b/projects/ci1.rc @@ -1,3 +1,3 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc \ No newline at end of file +rcinclude ../../wx280/include/wx/msw/wx.rc \ No newline at end of file diff --git a/projects/cm0.dsp b/projects/cm0.dsp index b6f869e03..a224caa03 100755 --- a/projects/cm0.dsp +++ b/projects/cm0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cm0.rc b/projects/cm0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cm0.rc +++ b/projects/cm0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/cm1.dsp b/projects/cm1.dsp index 037e8b1b6..5786c6a2e 100755 --- a/projects/cm1.dsp +++ b/projects/cm1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/cm1.rc b/projects/cm1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/cm1.rc +++ b/projects/cm1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/coffee.dsp b/projects/coffee.dsp index 63d304fe7..2ce4d5589 100755 --- a/projects/coffee.dsp +++ b/projects/coffee.dsp @@ -50,7 +50,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -72,18 +72,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/Coffee.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/Coffee.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "Coffee - Win32 Debug DLL" @@ -99,18 +99,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Coffee.exe" /pdbtype:sept /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Coffee.exe" /pdbtype:sept /libpath:"..\..\wx280\lib" !ELSEIF "$(CFG)" == "Coffee - Win32 Release DLL" @@ -126,18 +126,18 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Coffee.exe" /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Coffee.exe" /libpath:"..\..\wx280\lib" !ENDIF @@ -190,16 +190,16 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Coffee - Win32 Debug DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ELSEIF "$(CFG)" == "Coffee - Win32 Release DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ENDIF @@ -214,7 +214,7 @@ SOURCE=..\Lib\hlw32_mc.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\wxmsw263d.lib !IF "$(CFG)" == "Coffee - Win32 Release" @@ -231,7 +231,7 @@ SOURCE=..\..\wx263\lib\wxmsw263d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "Coffee - Win32 Release" diff --git a/projects/crpa0.dsp b/projects/crpa0.dsp index fd4d41546..b8bd41506 100755 --- a/projects/crpa0.dsp +++ b/projects/crpa0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/crpa0.rc b/projects/crpa0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/crpa0.rc +++ b/projects/crpa0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/crpa1.dsp b/projects/crpa1.dsp index e3acb7a72..e8e49dfc0 100755 --- a/projects/crpa1.dsp +++ b/projects/crpa1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/crpa1.rc b/projects/crpa1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/crpa1.rc +++ b/projects/crpa1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/database.dsp b/projects/database.dsp index 2805f456f..2353576ad 100755 --- a/projects/database.dsp +++ b/projects/database.dsp @@ -50,7 +50,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -77,13 +77,13 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib \wx233\lib\wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/DataBase.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib \wx233\lib\wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/DataBase.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "DataBase - Win32 Debug DLL" @@ -99,18 +99,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/DataBase.exe" /pdbtype:sept /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/DataBase.exe" /pdbtype:sept /libpath:"..\..\wx280\lib" !ELSEIF "$(CFG)" == "DataBase - Win32 Release DLL" @@ -126,18 +126,18 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/DataBase.exe" /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/DataBase.exe" /libpath:"..\..\wx280\lib" !ENDIF @@ -190,23 +190,23 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "DataBase - Win32 Debug DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ELSEIF "$(CFG)" == "DataBase - Win32 Release DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ENDIF # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\wxmsw263d.lib !IF "$(CFG)" == "DataBase - Win32 Release" @@ -223,7 +223,7 @@ SOURCE=..\..\wx263\lib\wxmsw263d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "DataBase - Win32 Release" diff --git a/projects/db0.dsp b/projects/db0.dsp index 2b5e69189..f6e6338bc 100755 --- a/projects/db0.dsp +++ b/projects/db0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/db0.rc b/projects/db0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/db0.rc +++ b/projects/db0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/db1.dsp b/projects/db1.dsp index 8902578c0..9a77316e8 100755 --- a/projects/db1.dsp +++ b/projects/db1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/db1.rc b/projects/db1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/db1.rc +++ b/projects/db1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/db2.dsp b/projects/db2.dsp index 4c7665121..a801ccf42 100755 --- a/projects/db2.dsp +++ b/projects/db2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/db2.rc b/projects/db2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/db2.rc +++ b/projects/db2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/diction.dsp b/projects/diction.dsp index 16cf3342e..9a7431082 100755 --- a/projects/diction.dsp +++ b/projects/diction.dsp @@ -50,7 +50,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -72,18 +72,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/Diction.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/Diction.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "Diction - Win32 Debug DLL" @@ -99,18 +99,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Diction.exe" /pdbtype:sept /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Diction.exe" /pdbtype:sept /libpath:"..\..\wx280\lib" !ELSEIF "$(CFG)" == "Diction - Win32 Release DLL" @@ -126,18 +126,18 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Diction.exe" /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Diction.exe" /libpath:"..\..\wx280\lib" !ENDIF @@ -186,32 +186,32 @@ SOURCE=..\server\server.rc !IF "$(CFG)" == "Diction - Win32 Release" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" # ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ELSEIF "$(CFG)" == "Diction - Win32 Debug" !ELSEIF "$(CFG)" == "Diction - Win32 Debug DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ELSEIF "$(CFG)" == "Diction - Win32 Release DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ENDIF # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\wxmsw263d.lib !IF "$(CFG)" == "Diction - Win32 Release" @@ -228,7 +228,7 @@ SOURCE=..\..\wx263\lib\wxmsw263d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "Diction - Win32 Release" diff --git a/projects/dl0.rc b/projects/dl0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/dl0.rc +++ b/projects/dl0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/dlinst.rc b/projects/dlinst.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/dlinst.rc +++ b/projects/dlinst.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/dt0.dsp b/projects/dt0.dsp index 13f791b39..afaee4458 100755 --- a/projects/dt0.dsp +++ b/projects/dt0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/dt0.rc b/projects/dt0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/dt0.rc +++ b/projects/dt0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ef0.dsp b/projects/ef0.dsp index 807071470..b44973b66 100755 --- a/projects/ef0.dsp +++ b/projects/ef0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ef0.rc b/projects/ef0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ef0.rc +++ b/projects/ef0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/in0.dsp b/projects/in0.dsp index 90988d226..df80a97c3 100755 --- a/projects/in0.dsp +++ b/projects/in0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/in0.rc b/projects/in0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/in0.rc +++ b/projects/in0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/lerch.dsp b/projects/lerch.dsp index aab950c21..a18282422 100755 --- a/projects/lerch.dsp +++ b/projects/lerch.dsp @@ -50,7 +50,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -72,18 +72,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "\U\Luca\r020200\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/Lerch.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"../exe/servers/Lerch.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "Lerch - Win32 Debug DLL" @@ -99,18 +99,18 @@ 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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Lerch.exe" /pdbtype:sept /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"../exed/servers/Lerch.exe" /pdbtype:sept /libpath:"..\..\wx280\lib" !ELSEIF "$(CFG)" == "Lerch - Win32 Release DLL" @@ -126,18 +126,18 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /Gi /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\server" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Lerch.exe" /libpath:"..\..\wx263\lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw263.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"D:\Release\Campo40/servers/Lerch.exe" /libpath:"..\..\wx280\lib" !ENDIF @@ -190,23 +190,23 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Lerch - Win32 Debug DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ELSEIF "$(CFG)" == "Lerch - Win32 Release DLL" # ADD BASE RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx263\include" -# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx263\include" -# SUBTRACT RSC /i "..\server" /i "..\..\wx263\include" +# SUBTRACT BASE RSC /i "..\server" /i "..\..\wx280\include" +# ADD RSC /l 0x410 /i "\U\Release\A_04_00\server" /i "\U\Luca\A_02_02\server" /i "\U\Luca\R_04_00\server" /i "\U\Luca\R_02_01\server" /i "\U\Luca\r030200\server" /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx280\include" +# SUBTRACT RSC /i "..\server" /i "..\..\wx280\include" !ENDIF # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "Lerch - Win32 Release" @@ -223,7 +223,7 @@ SOURCE=..\..\wx263\lib\wxmsw263.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\wxmsw263d.lib !IF "$(CFG)" == "Lerch - Win32 Release" diff --git a/projects/li0.dsp b/projects/li0.dsp index 9ebe1b622..2269aad84 100755 --- a/projects/li0.dsp +++ b/projects/li0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/li0.rc b/projects/li0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/li0.rc +++ b/projects/li0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mg0.dsp b/projects/mg0.dsp index 283d4ee56..82348b0d6 100755 --- a/projects/mg0.dsp +++ b/projects/mg0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mg0.rc b/projects/mg0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mg0.rc +++ b/projects/mg0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mg1.dsp b/projects/mg1.dsp index 522315bf3..f14090da5 100755 --- a/projects/mg1.dsp +++ b/projects/mg1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mg1.rc b/projects/mg1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mg1.rc +++ b/projects/mg1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mg3.dsp b/projects/mg3.dsp index 9d0daa490..219a2bec2 100755 --- a/projects/mg3.dsp +++ b/projects/mg3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mg3.rc b/projects/mg3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mg3.rc +++ b/projects/mg3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mg4.dsp b/projects/mg4.dsp index bbfcf1baf..87b0e07cb 100755 --- a/projects/mg4.dsp +++ b/projects/mg4.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mg4.rc b/projects/mg4.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mg4.rc +++ b/projects/mg4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mr0.dsp b/projects/mr0.dsp index 5a94921d0..04efc3436 100755 --- a/projects/mr0.dsp +++ b/projects/mr0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mr0.rc b/projects/mr0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mr0.rc +++ b/projects/mr0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mr1.dsp b/projects/mr1.dsp index f3b579393..e7ce94ea6 100755 --- a/projects/mr1.dsp +++ b/projects/mr1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mr1.rc b/projects/mr1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mr1.rc +++ b/projects/mr1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/mr2.dsp b/projects/mr2.dsp index 7b683d0fe..0da4e4bd8 100755 --- a/projects/mr2.dsp +++ b/projects/mr2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/mr2.rc b/projects/mr2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/mr2.rc +++ b/projects/mr2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/omnia0.dsp b/projects/omnia0.dsp index 643c723c7..1e064502c 100755 --- a/projects/omnia0.dsp +++ b/projects/omnia0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -74,7 +74,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/omnia0.rc b/projects/omnia0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/omnia0.rc +++ b/projects/omnia0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/or1.dsp b/projects/or1.dsp index 546962f2c..e9cfbe8b8 100755 --- a/projects/or1.dsp +++ b/projects/or1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/or1.rc b/projects/or1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/or1.rc +++ b/projects/or1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/pd1579.dsp b/projects/pd1579.dsp index 32f6126b7..260989ea3 100755 --- a/projects/pd1579.dsp +++ b/projects/pd1579.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/pd1579.rc b/projects/pd1579.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/pd1579.rc +++ b/projects/pd1579.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/pd1890.dsp b/projects/pd1890.dsp index ebfc5c216..cf91180ad 100755 --- a/projects/pd1890.dsp +++ b/projects/pd1890.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/pd1890.rc b/projects/pd1890.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/pd1890.rc +++ b/projects/pd1890.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/pd6030.dsp b/projects/pd6030.dsp index 2278a72b3..9352e5dc2 100755 --- a/projects/pd6030.dsp +++ b/projects/pd6030.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/pd6030.rc b/projects/pd6030.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/pd6030.rc +++ b/projects/pd6030.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/pdflib.rc b/projects/pdflib.rc index 72d540ba3..5601f76a8 100755 --- a/projects/pdflib.rc +++ b/projects/pdflib.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "winres.h" +//#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -16,10 +16,11 @@ // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 + +//#ifdef _WIN32 +//LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +//#pragma code_page(1252) +//#endif //_WIN32 #ifndef _MAC ///////////////////////////////////////////////////////////////////////////// @@ -77,7 +78,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""resource.h""\r\n" - "#include ""winres.h""\r\n" +// "#include ""winres.h""\r\n" "\0" END @@ -97,7 +98,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDRETRY "pdflib" + 4 "pdflib" END #endif // German (Germany) resources diff --git a/projects/pg0069.rc b/projects/pg0069.rc new file mode 100755 index 000000000..41a996650 --- /dev/null +++ b/projects/pg0069.rc @@ -0,0 +1,4 @@ +"9012" ICON DISCARDABLE "../exed/res/exe.ico" + +rcinclude ../../wx280/include/wx/msw/wx.rc + diff --git a/projects/pg0388.rc b/projects/pg0388.rc new file mode 100755 index 000000000..41a996650 --- /dev/null +++ b/projects/pg0388.rc @@ -0,0 +1,4 @@ +"9012" ICON DISCARDABLE "../exed/res/exe.ico" + +rcinclude ../../wx280/include/wx/msw/wx.rc + diff --git a/projects/pr0.dsp b/projects/pr0.dsp index 88ba92f4c..9b5f13f62 100755 --- a/projects/pr0.dsp +++ b/projects/pr0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/pr0.rc b/projects/pr0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/pr0.rc +++ b/projects/pr0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/pr1.dsp b/projects/pr1.dsp index c4a04972e..75366f386 100755 --- a/projects/pr1.dsp +++ b/projects/pr1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/pr1.rc b/projects/pr1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/pr1.rc +++ b/projects/pr1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ps0544.dsp b/projects/ps0544.dsp index 714bf1b56..dd4bfc91e 100755 --- a/projects/ps0544.dsp +++ b/projects/ps0544.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ps0544.rc b/projects/ps0544.rc new file mode 100755 index 000000000..41a996650 --- /dev/null +++ b/projects/ps0544.rc @@ -0,0 +1,4 @@ +"9012" ICON DISCARDABLE "../exed/res/exe.ico" + +rcinclude ../../wx280/include/wx/msw/wx.rc + diff --git a/projects/ps0816.dsp b/projects/ps0816.dsp index aaa4af02a..d467d9e40 100755 --- a/projects/ps0816.dsp +++ b/projects/ps0816.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ps0816.rc b/projects/ps0816.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ps0816.rc +++ b/projects/ps0816.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ps0872.dsp b/projects/ps0872.dsp index d5e7a8961..099adf6c1 100755 --- a/projects/ps0872.dsp +++ b/projects/ps0872.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ps0872.rc b/projects/ps0872.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ps0872.rc +++ b/projects/ps0872.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ps0913.rc b/projects/ps0913.rc new file mode 100755 index 000000000..41a996650 --- /dev/null +++ b/projects/ps0913.rc @@ -0,0 +1,4 @@ +"9012" ICON DISCARDABLE "../exed/res/exe.ico" + +rcinclude ../../wx280/include/wx/msw/wx.rc + diff --git a/projects/ps0920.dsp b/projects/ps0920.dsp index d42c35d5c..fc4ceb620 100755 --- a/projects/ps0920.dsp +++ b/projects/ps0920.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ps0920.rc b/projects/ps0920.rc index 8708387cf..41a996650 100755 --- a/projects/ps0920.rc +++ b/projects/ps0920.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exed/res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/pt0195.rc b/projects/pt0195.rc new file mode 100755 index 000000000..41a996650 --- /dev/null +++ b/projects/pt0195.rc @@ -0,0 +1,4 @@ +"9012" ICON DISCARDABLE "../exed/res/exe.ico" + +rcinclude ../../wx280/include/wx/msw/wx.rc + diff --git a/projects/sc0.dsp b/projects/sc0.dsp index c8433c686..5af0b6f82 100755 --- a/projects/sc0.dsp +++ b/projects/sc0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/sc0.rc b/projects/sc0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sc0.rc +++ b/projects/sc0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/sc1.dsp b/projects/sc1.dsp index 7c5261664..811f4f8c0 100755 --- a/projects/sc1.dsp +++ b/projects/sc1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "\wx263\include" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "\wx280\include" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -201,7 +201,7 @@ SOURCE=.\sc1.rc # ADD BASE RSC /l 0x410 # ADD RSC /l 0x410 -# SUBTRACT RSC /i "\wx263\include" +# SUBTRACT RSC /i "\wx280\include" !ELSEIF "$(CFG)" == "sc1 - Win32 Debug" diff --git a/projects/sc1.rc b/projects/sc1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sc1.rc +++ b/projects/sc1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/sc2.dsp b/projects/sc2.dsp index 12f75db32..d8f0463b3 100755 --- a/projects/sc2.dsp +++ b/projects/sc2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/sc2.rc b/projects/sc2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sc2.rc +++ b/projects/sc2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/sc3.dsp b/projects/sc3.dsp index 9202cd458..4374312f0 100755 --- a/projects/sc3.dsp +++ b/projects/sc3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "\wx263\include" /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "\wx280\include" /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -243,7 +243,7 @@ SOURCE=.\sc3.rc # ADD BASE RSC /l 0x410 # ADD RSC /l 0x410 -# SUBTRACT RSC /i "\wx263\include" +# SUBTRACT RSC /i "\wx280\include" !ELSEIF "$(CFG)" == "sc3 - Win32 Debug" diff --git a/projects/sc3.rc b/projects/sc3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sc3.rc +++ b/projects/sc3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/si0.rc b/projects/si0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/si0.rc +++ b/projects/si0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/soapserv.dsp b/projects/soapserv.dsp index b07a74bb9..b4f8937ef 100755 --- a/projects/soapserv.dsp +++ b/projects/soapserv.dsp @@ -72,7 +72,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 "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -83,7 +83,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 wsock32.lib winmm.lib /nologo /subsystem:windows /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/server.exe" /pdbtype:sept /libpath:"/wx263/lib" +# 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/server.exe" /pdbtype:sept /libpath:"/wx280/lib" !ELSEIF "$(CFG)" == "SoapServ - Win32 Debug DLL" @@ -186,7 +186,7 @@ SOURCE=.\server.rc !ELSEIF "$(CFG)" == "SoapServ - Win32 Debug" # ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i /wx263/include" " +# ADD RSC /l 0x809 /i /wx280/include" " !ELSEIF "$(CFG)" == "SoapServ - Win32 Debug DLL" @@ -196,7 +196,7 @@ SOURCE=.\server.rc !ELSEIF "$(CFG)" == "SoapServ - Win32 Release DLL" # ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "/wx263/include" +# ADD RSC /l 0x809 /i "/wx280/include" !ENDIF diff --git a/projects/sv0.dsp b/projects/sv0.dsp index 4fc5c7828..ac026ed8c 100755 --- a/projects/sv0.dsp +++ b/projects/sv0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/sv0.rc b/projects/sv0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sv0.rc +++ b/projects/sv0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/sv1.dsp b/projects/sv1.dsp index 20271855f..98ee879e0 100755 --- a/projects/sv1.dsp +++ b/projects/sv1.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/sv1.rc b/projects/sv1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sv1.rc +++ b/projects/sv1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/sv2.dsp b/projects/sv2.dsp index 956bdfd55..cb4c2a970 100755 --- a/projects/sv2.dsp +++ b/projects/sv2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/sv2.rc b/projects/sv2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/sv2.rc +++ b/projects/sv2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/tp0.dsp b/projects/tp0.dsp index f1f391765..53240cf46 100755 --- a/projects/tp0.dsp +++ b/projects/tp0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/tp0.rc b/projects/tp0.rc index 8708387cf..41a996650 100755 --- a/projects/tp0.rc +++ b/projects/tp0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exed/res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve0.dsp b/projects/ve0.dsp index dfcd9b86e..48ffe2350 100755 --- a/projects/ve0.dsp +++ b/projects/ve0.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve0.rc b/projects/ve0.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve0.rc +++ b/projects/ve0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve1.rc b/projects/ve1.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve1.rc +++ b/projects/ve1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve2.dsp b/projects/ve2.dsp index def1c61bb..98d28bbef 100755 --- a/projects/ve2.dsp +++ b/projects/ve2.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve2.rc b/projects/ve2.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve2.rc +++ b/projects/ve2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve3.dsp b/projects/ve3.dsp index e0309530a..cbab9b550 100755 --- a/projects/ve3.dsp +++ b/projects/ve3.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve3.rc b/projects/ve3.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve3.rc +++ b/projects/ve3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve4.dsp b/projects/ve4.dsp index 1ff1fbb6d..5c1c8d693 100755 --- a/projects/ve4.dsp +++ b/projects/ve4.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve4.rc b/projects/ve4.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve4.rc +++ b/projects/ve4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve5.dsp b/projects/ve5.dsp index 05d71c649..bc86118e4 100755 --- a/projects/ve5.dsp +++ b/projects/ve5.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve5.rc b/projects/ve5.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve5.rc +++ b/projects/ve5.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve6.dsp b/projects/ve6.dsp index c99e3e63f..02850b0b0 100755 --- a/projects/ve6.dsp +++ b/projects/ve6.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve6.rc b/projects/ve6.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve6.rc +++ b/projects/ve6.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve7.dsp b/projects/ve7.dsp index 59bfada75..8c83cfd37 100755 --- a/projects/ve7.dsp +++ b/projects/ve7.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve7.rc b/projects/ve7.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/ve7.rc +++ b/projects/ve7.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/ve8.dsp b/projects/ve8.dsp index d3fba376d..54ecd8687 100755 --- a/projects/ve8.dsp +++ b/projects/ve8.dsp @@ -48,7 +48,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -76,7 +76,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /i "..\..\wx263\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx280\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/ve8.rc b/projects/ve8.rc index 8708387cf..41a996650 100755 --- a/projects/ve8.rc +++ b/projects/ve8.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exed/res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/vesirio.rc b/projects/vesirio.rc index 6b57f6e0d..7e931c0f4 100755 --- a/projects/vesirio.rc +++ b/projects/vesirio.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../res/exe.ico" -rcinclude ../../wx263/include/wx/msw/wx.rc +rcinclude ../../wx280/include/wx/msw/wx.rc diff --git a/projects/xvaga.dsp b/projects/xvaga.dsp index e7e6a74d6..04f38176e 100755 --- a/projects/xvaga.dsp +++ b/projects/xvaga.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XVAGADLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /I "..\..\wx280\lib\vc_dll\msw" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XVAGADLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\wx280\lib\vc_dll\mswd" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" @@ -210,32 +210,6 @@ SOURCE=..\lib\hlw32_mc.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib - -!IF "$(CFG)" == "xvaga - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\wx263\lib\wxmsw263.lib - -!IF "$(CFG)" == "xvaga - Win32 Release" - -!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=..\lib\pdflibd.lib !IF "$(CFG)" == "xvaga - Win32 Release" @@ -259,6 +233,110 @@ SOURCE=..\lib\pdflib.lib !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28d_core.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28_odbc.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28d.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28_adv.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28_core.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib + +!IF "$(CFG)" == "xvaga - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvaga - Win32 Debug" + +!ENDIF + # End Source File # End Target # End Project diff --git a/projects/xvagadll.dsp b/projects/xvagadll.dsp index b6a26003d..d7c362d02 100755 --- a/projects/xvagadll.dsp +++ b/projects/xvagadll.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XVAGADLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /I "..\..\wx280\lib\mswdll" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XVAGADLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\wx280\lib\mswdlld" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D XVAGADLL=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" @@ -190,7 +190,7 @@ SOURCE=..\Lib\Skeylink.obj # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw240d.lib +SOURCE=..\..\wx280\lib\wxmsw240d.lib !IF "$(CFG)" == "xvagadll - Win32 Release" @@ -203,7 +203,7 @@ SOURCE=..\..\wx263\lib\wxmsw240d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\wxmsw263.lib !IF "$(CFG)" == "xvagadll - Win32 Release" diff --git a/projects/xvapp.dsp b/projects/xvapp.dsp index 493a3279b..1c3f3a835 100755 --- a/projects/xvapp.dsp +++ b/projects/xvapp.dsp @@ -40,10 +40,10 @@ RSC=rc.exe # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\Release\Xvapp" # PROP Target_Dir "" -AgaLib=link.exe -lib WxLib32=link.exe -lib +AgaLib=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wx263\lib\mswdll" /I "..\..\wx263\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wx280\lib\vc_dll\msw" /I "..\..\wx280\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe @@ -65,10 +65,10 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Debug/DebugXvapp" # PROP Target_Dir "" -AgaLib=link.exe -lib WxLib32=link.exe -lib +AgaLib=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\wx263\lib\mswdlld" /I "..\..\wx263\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\wx280\lib\vc_dll\mswd" /I "..\..\wx280\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe @@ -98,7 +98,7 @@ SOURCE=..\xvaga\xvapp.cpp # End Group # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263d.lib +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28d_core.lib !IF "$(CFG)" == "xvapp - Win32 Release" @@ -111,7 +111,7 @@ SOURCE=..\..\wx263\lib\wxmsw263d.lib # End Source File # Begin Source File -SOURCE=..\..\wx263\lib\wxmsw263.lib +SOURCE=..\..\wx280\lib\vc_dll\wxbase28.lib !IF "$(CFG)" == "xvapp - Win32 Release" @@ -121,6 +121,84 @@ SOURCE=..\..\wx263\lib\wxmsw263.lib !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28_odbc.lib + +!IF "$(CFG)" == "xvapp - Win32 Release" + +!ELSEIF "$(CFG)" == "xvapp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28d.lib + +!IF "$(CFG)" == "xvapp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvapp - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxbase28d_odbc.lib + +!IF "$(CFG)" == "xvapp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvapp - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28_adv.lib + +!IF "$(CFG)" == "xvapp - Win32 Release" + +!ELSEIF "$(CFG)" == "xvapp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28_core.lib + +!IF "$(CFG)" == "xvapp - Win32 Release" + +!ELSEIF "$(CFG)" == "xvapp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\wx280\lib\vc_dll\wxmsw28d_adv.lib + +!IF "$(CFG)" == "xvapp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "xvapp - Win32 Debug" + +!ENDIF + # End Source File # End Target # End Project