diff --git a/projects/770.dsp b/projects/770.dsp index 8514a1e4a..fe52f3f0f 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/770.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -129,7 +129,7 @@ SOURCE=..\m770\770100a.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100a.uml InputName=770100a @@ -141,7 +141,7 @@ InputName=770100a !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100a.uml InputName=770100a @@ -160,7 +160,7 @@ SOURCE=..\m770\770100b.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100b.uml InputName=770100b @@ -172,7 +172,7 @@ InputName=770100b !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100b.uml InputName=770100b @@ -191,7 +191,7 @@ SOURCE=..\m770\770100c.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100c.uml InputName=770100c @@ -203,7 +203,7 @@ InputName=770100c !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100c.uml InputName=770100c @@ -222,7 +222,7 @@ SOURCE=..\m770\770100d.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100d.uml InputName=770100d @@ -234,7 +234,7 @@ InputName=770100d !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100d.uml InputName=770100d @@ -253,7 +253,7 @@ SOURCE=..\m770\770100e.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100e.uml InputName=770100e @@ -265,7 +265,7 @@ InputName=770100e !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100e.uml InputName=770100e @@ -284,7 +284,7 @@ SOURCE=..\m770\770100f.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100f.uml InputName=770100f @@ -296,7 +296,7 @@ InputName=770100f !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100f.uml InputName=770100f @@ -315,7 +315,7 @@ SOURCE=..\m770\770100g.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770100g.uml InputName=770100g @@ -327,7 +327,7 @@ InputName=770100g !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770100g.uml InputName=770100g @@ -346,7 +346,7 @@ SOURCE=..\m770\770200a.uml !IF "$(CFG)" == "770 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\770200a.uml InputName=770200a @@ -358,7 +358,7 @@ InputName=770200a !ELSEIF "$(CFG)" == "770 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\770200a.uml InputName=770200a @@ -383,7 +383,7 @@ SOURCE=.\770.rc !ELSEIF "$(CFG)" == "770 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/770.res" +# ADD RSC /l 0x410 /fo"..\Debug/770.res" !ENDIF diff --git a/projects/770.rc b/projects/770.rc index 67577a439..73b2f2002 100755 --- a/projects/770.rc +++ b/projects/770.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/771mod.dsp b/projects/771mod.dsp index 8f7566894..39d4a28d4 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/771mod.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -165,7 +165,7 @@ SOURCE=..\m770\771100a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100a.uml InputName=771100a @@ -177,7 +177,7 @@ InputName=771100a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100a.uml InputName=771100a @@ -196,7 +196,7 @@ SOURCE=..\m770\771100b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100b.uml InputName=771100b @@ -208,7 +208,7 @@ InputName=771100b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100b.uml InputName=771100b @@ -227,7 +227,7 @@ SOURCE=..\m770\771100c.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100c.uml InputName=771100c @@ -239,7 +239,7 @@ InputName=771100c !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100c.uml InputName=771100c @@ -258,7 +258,7 @@ SOURCE=..\m770\771100d.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100d.uml InputName=771100d @@ -270,7 +270,7 @@ InputName=771100d !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100d.uml InputName=771100d @@ -289,7 +289,7 @@ SOURCE=..\m770\771100e.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100e.uml InputName=771100e @@ -301,7 +301,7 @@ InputName=771100e !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100e.uml InputName=771100e @@ -320,7 +320,7 @@ SOURCE=..\m770\771100f.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100f.uml InputName=771100f @@ -332,7 +332,7 @@ InputName=771100f !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100f.uml InputName=771100f @@ -351,7 +351,7 @@ SOURCE=..\m770\771100g.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100g.uml InputName=771100g @@ -363,7 +363,7 @@ InputName=771100g !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100g.uml InputName=771100g @@ -382,7 +382,7 @@ SOURCE=..\m770\771100h.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771100h.uml InputName=771100h @@ -394,7 +394,7 @@ InputName=771100h !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771100h.uml InputName=771100h @@ -413,7 +413,7 @@ SOURCE=..\m770\771150a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771150a.uml InputName=771150a @@ -425,7 +425,7 @@ InputName=771150a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771150a.uml InputName=771150a @@ -444,7 +444,7 @@ SOURCE=..\m770\771200a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200a.uml InputName=771200a @@ -456,7 +456,7 @@ InputName=771200a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200a.uml InputName=771200a @@ -475,7 +475,7 @@ SOURCE=..\m770\771200b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200b.uml InputName=771200b @@ -487,7 +487,7 @@ InputName=771200b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200b.uml InputName=771200b @@ -506,7 +506,7 @@ SOURCE=..\m770\771200c.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200c.uml InputName=771200c @@ -518,7 +518,7 @@ InputName=771200c !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200c.uml InputName=771200c @@ -537,7 +537,7 @@ SOURCE=..\m770\771200d.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200d.uml InputName=771200d @@ -549,7 +549,7 @@ InputName=771200d !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200d.uml InputName=771200d @@ -568,7 +568,7 @@ SOURCE=..\m770\771200e.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200e.uml InputName=771200e @@ -580,7 +580,7 @@ InputName=771200e !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200e.uml InputName=771200e @@ -599,7 +599,7 @@ SOURCE=..\m770\771200f.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200f.uml InputName=771200f @@ -611,7 +611,7 @@ InputName=771200f !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200f.uml InputName=771200f @@ -630,7 +630,7 @@ SOURCE=..\m770\771200g.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200g.uml InputName=771200g @@ -642,7 +642,7 @@ InputName=771200g !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200g.uml InputName=771200g @@ -661,7 +661,7 @@ SOURCE=..\m770\771200h.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200h.uml InputName=771200h @@ -673,7 +673,7 @@ InputName=771200h !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200h.uml InputName=771200h @@ -692,7 +692,7 @@ SOURCE=..\m770\771200i.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200i.uml InputName=771200i @@ -704,7 +704,7 @@ InputName=771200i !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200i.uml InputName=771200i @@ -723,7 +723,7 @@ SOURCE=..\m770\771200l.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200l.uml InputName=771200l @@ -735,7 +735,7 @@ InputName=771200l !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200l.uml InputName=771200l @@ -754,7 +754,7 @@ SOURCE=..\m770\771200m.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771200m.uml InputName=771200m @@ -766,7 +766,7 @@ InputName=771200m !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771200m.uml InputName=771200m @@ -785,7 +785,7 @@ SOURCE=..\m770\771230c.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230c.uml InputName=771230c @@ -797,7 +797,7 @@ InputName=771230c !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230c.uml InputName=771230c @@ -816,7 +816,7 @@ SOURCE=..\m770\771230d.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230d.uml InputName=771230d @@ -828,7 +828,7 @@ InputName=771230d !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230d.uml InputName=771230d @@ -847,7 +847,7 @@ SOURCE=..\m770\771230d1.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230d1.uml InputName=771230d1 @@ -859,7 +859,7 @@ InputName=771230d1 !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230d1.uml InputName=771230d1 @@ -878,7 +878,7 @@ SOURCE=..\m770\771230db.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230db.uml InputName=771230db @@ -890,7 +890,7 @@ InputName=771230db !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230db.uml InputName=771230db @@ -909,7 +909,7 @@ SOURCE=..\m770\771230e.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230e.uml InputName=771230e @@ -921,7 +921,7 @@ InputName=771230e !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230e.uml InputName=771230e @@ -940,7 +940,7 @@ SOURCE=..\m770\771230e1.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230e1.uml InputName=771230e1 @@ -952,7 +952,7 @@ InputName=771230e1 !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230e1.uml InputName=771230e1 @@ -971,7 +971,7 @@ SOURCE=..\m770\771230e2.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230e2.uml InputName=771230e2 @@ -983,7 +983,7 @@ InputName=771230e2 !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230e2.uml InputName=771230e2 @@ -1002,7 +1002,7 @@ SOURCE=..\m770\771230pr.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771230pr.uml InputName=771230pr @@ -1014,7 +1014,7 @@ InputName=771230pr !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771230pr.uml InputName=771230pr @@ -1033,7 +1033,7 @@ SOURCE=..\m770\771231a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771231a.uml InputName=771231a @@ -1045,7 +1045,7 @@ InputName=771231a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771231a.uml InputName=771231a @@ -1064,7 +1064,7 @@ SOURCE=..\m770\771231b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771231b.uml InputName=771231b @@ -1076,7 +1076,7 @@ InputName=771231b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771231b.uml InputName=771231b @@ -1095,7 +1095,7 @@ SOURCE=..\m770\771231c.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771231c.uml InputName=771231c @@ -1107,7 +1107,7 @@ InputName=771231c !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771231c.uml InputName=771231c @@ -1126,7 +1126,7 @@ SOURCE=..\m770\771232a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771232a.uml InputName=771232a @@ -1138,7 +1138,7 @@ InputName=771232a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771232a.uml InputName=771232a @@ -1157,7 +1157,7 @@ SOURCE=..\m770\771232b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771232b.uml InputName=771232b @@ -1169,7 +1169,7 @@ InputName=771232b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771232b.uml InputName=771232b @@ -1188,7 +1188,7 @@ SOURCE=..\m770\771233a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771233a.uml InputName=771233a @@ -1200,7 +1200,7 @@ InputName=771233a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771233a.uml InputName=771233a @@ -1219,7 +1219,7 @@ SOURCE=..\m770\771233b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771233b.uml InputName=771233b @@ -1231,7 +1231,7 @@ InputName=771233b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771233b.uml InputName=771233b @@ -1250,7 +1250,7 @@ SOURCE=..\m770\771234a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771234a.uml InputName=771234a @@ -1262,7 +1262,7 @@ InputName=771234a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771234a.uml InputName=771234a @@ -1281,7 +1281,7 @@ SOURCE=..\m770\771234b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771234b.uml InputName=771234b @@ -1293,7 +1293,7 @@ InputName=771234b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771234b.uml InputName=771234b @@ -1312,7 +1312,7 @@ SOURCE=..\m770\771234c.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771234c.uml InputName=771234c @@ -1324,7 +1324,7 @@ InputName=771234c !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771234c.uml InputName=771234c @@ -1343,7 +1343,7 @@ SOURCE=..\m770\771234d.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771234d.uml InputName=771234d @@ -1355,7 +1355,7 @@ InputName=771234d !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771234d.uml InputName=771234d @@ -1374,7 +1374,7 @@ SOURCE=..\m770\771234e.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771234e.uml InputName=771234e @@ -1386,7 +1386,7 @@ InputName=771234e !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771234e.uml InputName=771234e @@ -1405,7 +1405,7 @@ SOURCE=..\m770\771290a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771290a.uml InputName=771290a @@ -1417,7 +1417,7 @@ InputName=771290a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771290a.uml InputName=771290a @@ -1436,7 +1436,7 @@ SOURCE=..\m770\771295a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771295a.uml InputName=771295a @@ -1448,7 +1448,7 @@ InputName=771295a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771295a.uml InputName=771295a @@ -1467,7 +1467,7 @@ SOURCE=..\m770\771300a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771300a.uml InputName=771300a @@ -1479,7 +1479,7 @@ InputName=771300a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771300a.uml InputName=771300a @@ -1498,7 +1498,7 @@ SOURCE=..\m770\771310a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771310a.uml InputName=771310a @@ -1510,7 +1510,7 @@ InputName=771310a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771310a.uml InputName=771310a @@ -1529,7 +1529,7 @@ SOURCE=..\m770\771310b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771310b.uml InputName=771310b @@ -1541,7 +1541,7 @@ InputName=771310b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771310b.uml InputName=771310b @@ -1560,7 +1560,7 @@ SOURCE=..\m770\771400a.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771400a.uml InputName=771400a @@ -1572,7 +1572,7 @@ InputName=771400a !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771400a.uml InputName=771400a @@ -1591,7 +1591,7 @@ SOURCE=..\m770\771400b.uml !IF "$(CFG)" == "771mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\771400b.uml InputName=771400b @@ -1603,7 +1603,7 @@ InputName=771400b !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\771400b.uml InputName=771400b @@ -1628,7 +1628,7 @@ SOURCE=.\771mod.rc !ELSEIF "$(CFG)" == "771mod - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/771mod.res" +# ADD RSC /l 0x410 /fo"..\Debug/771mod.res" !ENDIF diff --git a/projects/771mod.rc b/projects/771mod.rc index 67577a439..73b2f2002 100755 --- a/projects/771mod.rc +++ b/projects/771mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/772mod.dsp b/projects/772mod.dsp index e750418bf..5113a9462 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/772mod.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -129,7 +129,7 @@ SOURCE=..\m770\772100a.uml !IF "$(CFG)" == "772mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\772100a.uml InputName=772100a @@ -141,7 +141,7 @@ InputName=772100a !ELSEIF "$(CFG)" == "772mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\772100a.uml InputName=772100a @@ -160,7 +160,7 @@ SOURCE=..\m770\772200a.uml !IF "$(CFG)" == "772mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\772200a.uml InputName=772200a @@ -172,7 +172,7 @@ InputName=772200a !ELSEIF "$(CFG)" == "772mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\772200a.uml InputName=772200a @@ -191,7 +191,7 @@ SOURCE=..\m770\772300a.uml !IF "$(CFG)" == "772mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\772300a.uml InputName=772300a @@ -203,7 +203,7 @@ InputName=772300a !ELSEIF "$(CFG)" == "772mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\772300a.uml InputName=772300a @@ -222,7 +222,7 @@ SOURCE=..\m770\772400a.uml !IF "$(CFG)" == "772mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\772400a.uml InputName=772400a @@ -234,7 +234,7 @@ InputName=772400a !ELSEIF "$(CFG)" == "772mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\772400a.uml InputName=772400a @@ -259,7 +259,7 @@ SOURCE=.\772mod.rc !ELSEIF "$(CFG)" == "772mod - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/772mod.res" +# ADD RSC /l 0x410 /fo"..\Debug/772mod.res" !ENDIF diff --git a/projects/772mod.rc b/projects/772mod.rc index 67577a439..73b2f2002 100755 --- a/projects/772mod.rc +++ b/projects/772mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/773mod.dsp b/projects/773mod.dsp index cdd906555..a636df125 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/773mod.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -137,7 +137,7 @@ SOURCE=..\m770\773100a.uml !IF "$(CFG)" == "773mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\773100a.uml InputName=773100a @@ -149,7 +149,7 @@ InputName=773100a !ELSEIF "$(CFG)" == "773mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\773100a.uml InputName=773100a @@ -174,7 +174,7 @@ SOURCE=.\773mod.rc !ELSEIF "$(CFG)" == "773mod - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/773mod.res" +# ADD RSC /l 0x410 /fo"..\Debug/773mod.res" !ENDIF diff --git a/projects/773mod.rc b/projects/773mod.rc index 67577a439..73b2f2002 100755 --- a/projects/773mod.rc +++ b/projects/773mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/774.dsp b/projects/774.dsp index 3a317e8e3..bb7e464dc 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/774.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -133,7 +133,7 @@ SOURCE=..\m770\774200a.uml !IF "$(CFG)" == "774 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\774200a.uml InputName=774200a @@ -145,7 +145,7 @@ InputName=774200a !ELSEIF "$(CFG)" == "774 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\774200a.uml InputName=774200a @@ -164,7 +164,7 @@ SOURCE=..\m770\774300a.uml !IF "$(CFG)" == "774 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\774300a.uml InputName=774300a @@ -176,7 +176,7 @@ InputName=774300a !ELSEIF "$(CFG)" == "774 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\774300a.uml InputName=774300a @@ -201,7 +201,7 @@ SOURCE=.\774.rc !ELSEIF "$(CFG)" == "774 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/774.res" +# ADD RSC /l 0x410 /fo"..\Debug/774.res" !ENDIF diff --git a/projects/774.rc b/projects/774.rc index 67577a439..73b2f2002 100755 --- a/projects/774.rc +++ b/projects/774.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/775.dsp b/projects/775.dsp index fb24e1ec5..a18a0e5f4 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/775.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -121,7 +121,7 @@ SOURCE=..\m770\775100a.uml !IF "$(CFG)" == "775 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\775100a.uml InputName=775100a @@ -133,7 +133,7 @@ InputName=775100a !ELSEIF "$(CFG)" == "775 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\775100a.uml InputName=775100a @@ -158,7 +158,7 @@ SOURCE=.\775.rc !ELSEIF "$(CFG)" == "775 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/775.res" +# ADD RSC /l 0x410 /fo"..\Debug/775.res" !ENDIF diff --git a/projects/775.rc b/projects/775.rc index 67577a439..73b2f2002 100755 --- a/projects/775.rc +++ b/projects/775.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/776mod.dsp b/projects/776mod.dsp index 739c89cc0..6118a3eaf 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/776mod.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -137,7 +137,7 @@ SOURCE=..\m770\776100a.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776100a.uml InputName=776100a @@ -149,7 +149,7 @@ InputName=776100a !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776100a.uml InputName=776100a @@ -168,7 +168,7 @@ SOURCE=..\m770\776100b.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776100b.uml InputName=776100b @@ -180,7 +180,7 @@ InputName=776100b !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776100b.uml InputName=776100b @@ -199,7 +199,7 @@ SOURCE=..\m770\776200a.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776200a.uml InputName=776200a @@ -211,7 +211,7 @@ InputName=776200a !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776200a.uml InputName=776200a @@ -230,7 +230,7 @@ SOURCE=..\m770\776300a.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776300a.uml InputName=776300a @@ -242,7 +242,7 @@ InputName=776300a !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776300a.uml InputName=776300a @@ -261,7 +261,7 @@ SOURCE=..\m770\776400a.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776400a.uml InputName=776400a @@ -273,7 +273,7 @@ InputName=776400a !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776400a.uml InputName=776400a @@ -292,7 +292,7 @@ SOURCE=..\m770\776500a.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776500a.uml InputName=776500a @@ -304,7 +304,7 @@ InputName=776500a !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776500a.uml InputName=776500a @@ -323,7 +323,7 @@ SOURCE=..\m770\776600a.uml !IF "$(CFG)" == "776mod - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\776600a.uml InputName=776600a @@ -335,7 +335,7 @@ InputName=776600a !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\776600a.uml InputName=776600a @@ -360,7 +360,7 @@ SOURCE=.\776mod.rc !ELSEIF "$(CFG)" == "776mod - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/776mod.res" +# ADD RSC /l 0x410 /fo"..\Debug/776mod.res" !ENDIF diff --git a/projects/776mod.rc b/projects/776mod.rc index 67577a439..73b2f2002 100755 --- a/projects/776mod.rc +++ b/projects/776mod.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/777.dsp b/projects/777.dsp index 5139253cf..f9ca58fb4 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/777.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -117,7 +117,7 @@ SOURCE=..\m770\777100a.uml !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\777100a.uml InputName=777100a @@ -129,7 +129,7 @@ InputName=777100a !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\777100a.uml InputName=777100a @@ -152,7 +152,7 @@ SOURCE=..\m770\77as.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77as.frm InputName=77as @@ -164,7 +164,7 @@ InputName=77as !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77as.frm InputName=77as @@ -183,7 +183,7 @@ SOURCE=..\m770\77base1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77base1.frm InputName=77base1 @@ -195,7 +195,7 @@ InputName=77base1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77base1.frm InputName=77base1 @@ -214,7 +214,7 @@ SOURCE=..\m770\77base2.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77base2.frm InputName=77base2 @@ -226,7 +226,7 @@ InputName=77base2 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77base2.frm InputName=77base2 @@ -245,7 +245,7 @@ SOURCE=..\m770\77base3.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77base3.frm InputName=77base3 @@ -257,7 +257,7 @@ InputName=77base3 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77base3.frm InputName=77base3 @@ -276,7 +276,7 @@ SOURCE=..\m770\77base4.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77base4.frm InputName=77base4 @@ -288,7 +288,7 @@ InputName=77base4 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77base4.frm InputName=77base4 @@ -307,7 +307,7 @@ SOURCE=..\m770\77busta.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77busta.frm InputName=77busta @@ -319,7 +319,7 @@ InputName=77busta !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77busta.frm InputName=77busta @@ -338,7 +338,7 @@ SOURCE=..\m770\77logazz.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77logazz.frm InputName=77logazz @@ -350,7 +350,7 @@ InputName=77logazz !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77logazz.frm InputName=77logazz @@ -369,7 +369,7 @@ SOURCE=..\m770\77qa.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qa.frm InputName=77qa @@ -381,7 +381,7 @@ InputName=77qa !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qa.frm InputName=77qa @@ -400,7 +400,7 @@ SOURCE=..\m770\77qa1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qa1.frm InputName=77qa1 @@ -412,7 +412,7 @@ InputName=77qa1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qa1.frm InputName=77qa1 @@ -431,7 +431,7 @@ SOURCE=..\m770\77qa2.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qa2.frm InputName=77qa2 @@ -443,7 +443,7 @@ InputName=77qa2 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qa2.frm InputName=77qa2 @@ -462,7 +462,7 @@ SOURCE=..\m770\77qa3.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qa3.frm InputName=77qa3 @@ -474,7 +474,7 @@ InputName=77qa3 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qa3.frm InputName=77qa3 @@ -493,7 +493,7 @@ SOURCE=..\m770\77qab.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qab.frm InputName=77qab @@ -505,7 +505,7 @@ InputName=77qab !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qab.frm InputName=77qab @@ -524,7 +524,7 @@ SOURCE=..\m770\77qb.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qb.frm InputName=77qb @@ -536,7 +536,7 @@ InputName=77qb !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qb.frm InputName=77qb @@ -555,7 +555,7 @@ SOURCE=..\m770\77qb1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qb1.frm InputName=77qb1 @@ -567,7 +567,7 @@ InputName=77qb1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qb1.frm InputName=77qb1 @@ -586,7 +586,7 @@ SOURCE=..\m770\77qc.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qc.frm InputName=77qc @@ -598,7 +598,7 @@ InputName=77qc !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qc.frm InputName=77qc @@ -617,7 +617,7 @@ SOURCE=..\m770\77qd.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qd.frm InputName=77qd @@ -629,7 +629,7 @@ InputName=77qd !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qd.frm InputName=77qd @@ -648,7 +648,7 @@ SOURCE=..\m770\77qd1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qd1.frm InputName=77qd1 @@ -660,7 +660,7 @@ InputName=77qd1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qd1.frm InputName=77qd1 @@ -679,7 +679,7 @@ SOURCE=..\m770\77qdb.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qdb.frm InputName=77qdb @@ -691,7 +691,7 @@ InputName=77qdb !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qdb.frm InputName=77qdb @@ -710,7 +710,7 @@ SOURCE=..\m770\77qe.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qe.frm InputName=77qe @@ -722,7 +722,7 @@ InputName=77qe !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qe.frm InputName=77qe @@ -741,7 +741,7 @@ SOURCE=..\m770\77qe1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qe1.frm InputName=77qe1 @@ -753,7 +753,7 @@ InputName=77qe1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qe1.frm InputName=77qe1 @@ -772,7 +772,7 @@ SOURCE=..\m770\77qe2.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qe2.frm InputName=77qe2 @@ -784,7 +784,7 @@ InputName=77qe2 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qe2.frm InputName=77qe2 @@ -803,7 +803,7 @@ SOURCE=..\m770\77qf.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qf.frm InputName=77qf @@ -815,7 +815,7 @@ InputName=77qf !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qf.frm InputName=77qf @@ -834,7 +834,7 @@ SOURCE=..\m770\77qf1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qf1.frm InputName=77qf1 @@ -846,7 +846,7 @@ InputName=77qf1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qf1.frm InputName=77qf1 @@ -865,7 +865,7 @@ SOURCE=..\m770\77qf2.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qf2.frm InputName=77qf2 @@ -877,7 +877,7 @@ InputName=77qf2 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qf2.frm InputName=77qf2 @@ -896,7 +896,7 @@ SOURCE=..\m770\77qg.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qg.frm InputName=77qg @@ -908,7 +908,7 @@ InputName=77qg !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qg.frm InputName=77qg @@ -927,7 +927,7 @@ SOURCE=..\m770\77qg1.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qg1.frm InputName=77qg1 @@ -939,7 +939,7 @@ InputName=77qg1 !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qg1.frm InputName=77qg1 @@ -958,7 +958,7 @@ SOURCE=..\m770\77qga.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qga.frm InputName=77qga @@ -970,7 +970,7 @@ InputName=77qga !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qga.frm InputName=77qga @@ -989,7 +989,7 @@ SOURCE=..\m770\77qgd.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qgd.frm InputName=77qgd @@ -1001,7 +1001,7 @@ InputName=77qgd !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qgd.frm InputName=77qgd @@ -1020,7 +1020,7 @@ SOURCE=..\m770\77qh.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qh.frm InputName=77qh @@ -1032,7 +1032,7 @@ InputName=77qh !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qh.frm InputName=77qh @@ -1051,7 +1051,7 @@ SOURCE=..\m770\77ql.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77ql.frm InputName=77ql @@ -1063,7 +1063,7 @@ InputName=77ql !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77ql.frm InputName=77ql @@ -1082,7 +1082,7 @@ SOURCE=..\m770\77qla.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qla.frm InputName=77qla @@ -1094,7 +1094,7 @@ InputName=77qla !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qla.frm InputName=77qla @@ -1113,7 +1113,7 @@ SOURCE=..\m770\77qn.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qn.frm InputName=77qn @@ -1125,7 +1125,7 @@ InputName=77qn !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qn.frm InputName=77qn @@ -1144,7 +1144,7 @@ SOURCE=..\m770\77qsc.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qsc.frm InputName=77qsc @@ -1156,7 +1156,7 @@ InputName=77qsc !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qsc.frm InputName=77qsc @@ -1175,7 +1175,7 @@ SOURCE=..\m770\77qse.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qse.frm InputName=77qse @@ -1187,7 +1187,7 @@ InputName=77qse !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qse.frm InputName=77qse @@ -1206,7 +1206,7 @@ SOURCE=..\m770\77qsk.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qsk.frm InputName=77qsk @@ -1218,7 +1218,7 @@ InputName=77qsk !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qsk.frm InputName=77qsk @@ -1237,7 +1237,7 @@ SOURCE=..\m770\77qst.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77qst.frm InputName=77qst @@ -1249,7 +1249,7 @@ InputName=77qst !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77qst.frm InputName=77qst @@ -1268,7 +1268,7 @@ SOURCE=..\m770\77srla.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srla.frm InputName=77srla @@ -1280,7 +1280,7 @@ InputName=77srla !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srla.frm InputName=77srla @@ -1299,7 +1299,7 @@ SOURCE=..\m770\77srsc.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsc.frm InputName=77srsc @@ -1311,7 +1311,7 @@ InputName=77srsc !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsc.frm InputName=77srsc @@ -1330,7 +1330,7 @@ SOURCE=..\m770\77srse.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srse.frm InputName=77srse @@ -1342,7 +1342,7 @@ InputName=77srse !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srse.frm InputName=77srse @@ -1361,7 +1361,7 @@ SOURCE=..\m770\77srsf.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsf.frm InputName=77srsf @@ -1373,7 +1373,7 @@ InputName=77srsf !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsf.frm InputName=77srsf @@ -1392,7 +1392,7 @@ SOURCE=..\m770\77srsg.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsg.frm InputName=77srsg @@ -1404,7 +1404,7 @@ InputName=77srsg !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsg.frm InputName=77srsg @@ -1423,7 +1423,7 @@ SOURCE=..\m770\77srsh.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsh.frm InputName=77srsh @@ -1435,7 +1435,7 @@ InputName=77srsh !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsh.frm InputName=77srsh @@ -1454,7 +1454,7 @@ SOURCE=..\m770\77srsl.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsl.frm InputName=77srsl @@ -1466,7 +1466,7 @@ InputName=77srsl !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsl.frm InputName=77srsl @@ -1485,7 +1485,7 @@ SOURCE=..\m770\77srsp.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsp.frm InputName=77srsp @@ -1497,7 +1497,7 @@ InputName=77srsp !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsp.frm InputName=77srsp @@ -1516,7 +1516,7 @@ SOURCE=..\m770\77srsq.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srsq.frm InputName=77srsq @@ -1528,7 +1528,7 @@ InputName=77srsq !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srsq.frm InputName=77srsq @@ -1547,7 +1547,7 @@ SOURCE=..\m770\77srst.frm !IF "$(CFG)" == "777 - Win32 Release" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77srst.frm InputName=77srst @@ -1559,7 +1559,7 @@ InputName=77srst !ELSEIF "$(CFG)" == "777 - Win32 Debug" # Begin Custom Build - Compiling form $(InputName)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77srst.frm InputName=77srst @@ -1584,7 +1584,7 @@ SOURCE=.\777.rc !ELSEIF "$(CFG)" == "777 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/777.res" +# ADD RSC /l 0x410 /fo"..\Debug/777.res" !ENDIF diff --git a/projects/777.rc b/projects/777.rc index 67577a439..73b2f2002 100755 --- a/projects/777.rc +++ b/projects/777.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/77cnv.dsp b/projects/77cnv.dsp index c846d42e8..d695214e9 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\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 /fo"Debug/77cnv.res" /i "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -109,7 +109,7 @@ SOURCE=..\m770\77cnva.uml !IF "$(CFG)" == "77cnv - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\m770\77cnva.uml InputName=77cnva @@ -121,7 +121,7 @@ InputName=77cnva !ELSEIF "$(CFG)" == "77cnv - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\m770\77cnva.uml InputName=77cnva @@ -146,7 +146,7 @@ SOURCE=.\77cnv.rc !ELSEIF "$(CFG)" == "77cnv - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/77cnv.res" +# ADD RSC /l 0x410 /fo"..\Debug/77cnv.res" !ENDIF diff --git a/projects/77cnv.rc b/projects/77cnv.rc index 67577a439..73b2f2002 100755 --- a/projects/77cnv.rc +++ b/projects/77cnv.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/agalib.dsp b/projects/agalib.dsp index 3a8234ff8..88199e70b 100755 --- a/projects/agalib.dsp +++ b/projects/agalib.dsp @@ -40,10 +40,10 @@ RSC=rc.exe # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\release" # 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 "XVT" /D "XI_R4" /D "CB6" /YX /FD /c # ADD BASE RSC /l 0x410 @@ -65,10 +65,10 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\debug" # 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" /D "XVT" /D "XI_R4" /D "CB6" /FR /FD /c # SUBTRACT CPP /YX @@ -76,7 +76,7 @@ AgaLib=link.exe -lib # ADD RSC /l 0x410 BSC32=bscmake.exe # ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\Projects\debug/AgaLibD.bsc" +# ADD BSC32 /nologo /o"..\debug/AgaLibD.bsc" LIB32=link.exe -lib # ADD LIB32 /out:"..\lib\AgaLibD.lib" diff --git a/projects/agalib_bagn.dsp b/projects/agalib_bagn.dsp index 7585dcccc..0d9ea4855 100755 --- a/projects/agalib_bagn.dsp +++ b/projects/agalib_bagn.dsp @@ -92,14 +92,14 @@ LINK32=link.exe # PROP Default_Filter "uml" # Begin Source File -SOURCE=..\mg\bastcau.uml +SOURCE=..\include\bagn001a.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\bastcau.uml -InputName=bastcau +InputPath=..\include\bagn001a.uml +InputName=bagn001a "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -110,8 +110,8 @@ InputName=bastcau # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\bastcau.uml -InputName=bastcau +InputPath=..\include\bagn001a.uml +InputName=bagn001a "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -123,14 +123,14 @@ InputName=bastcau # End Source File # Begin Source File -SOURCE=..\mg\bastfca.uml +SOURCE=..\include\bagn002.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\bastfca.uml -InputName=bastfca +InputPath=..\include\bagn002.uml +InputName=bagn002 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -141,8 +141,8 @@ InputName=bastfca # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\bastfca.uml -InputName=bastfca +InputPath=..\include\bagn002.uml +InputName=bagn002 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -154,14 +154,14 @@ InputName=bastfca # End Source File # Begin Source File -SOURCE=..\mg\bastfcg.uml +SOURCE=..\include\bagn004.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\bastfcg.uml -InputName=bastfcg +InputPath=..\include\bagn004.uml +InputName=bagn004 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -172,8 +172,8 @@ InputName=bastfcg # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\bastfcg.uml -InputName=bastfcg +InputPath=..\include\bagn004.uml +InputName=bagn004 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -185,14 +185,14 @@ InputName=bastfcg # End Source File # Begin Source File -SOURCE=..\mg\bastrfc.uml +SOURCE=..\include\bagn005.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\bastrfc.uml -InputName=bastrfc +InputPath=..\include\bagn005.uml +InputName=bagn005 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -203,8 +203,8 @@ InputName=bastrfc # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\bastrfc.uml -InputName=bastrfc +InputPath=..\include\bagn005.uml +InputName=bagn005 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -216,14 +216,14 @@ InputName=bastrfc # End Source File # Begin Source File -SOURCE=..\mg\bastubi.uml +SOURCE=..\include\bagn006.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\bastubi.uml -InputName=bastubi +InputPath=..\include\bagn006.uml +InputName=bagn006 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -234,8 +234,8 @@ InputName=bastubi # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\bastubi.uml -InputName=bastubi +InputPath=..\include\bagn006.uml +InputName=bagn006 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -247,14 +247,14 @@ InputName=bastubi # End Source File # Begin Source File -SOURCE=..\mg\batbcau.uml +SOURCE=..\include\bagn007.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbcau.uml -InputName=batbcau +InputPath=..\include\bagn007.uml +InputName=bagn007 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk @@ -265,194 +265,8 @@ InputName=batbcau # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbcau.uml -InputName=batbcau - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\mg\batbfca.uml - -!IF "$(CFG)" == "agalib_bagn - Win32 Release" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbfca.uml -InputName=batbfca - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbfca.uml -InputName=batbfca - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\mg\batbfcg.uml - -!IF "$(CFG)" == "agalib_bagn - Win32 Release" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbfcg.uml -InputName=batbfcg - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbfcg.uml -InputName=batbfcg - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\mg\batbgca.uml - -!IF "$(CFG)" == "agalib_bagn - Win32 Release" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbgca.uml -InputName=batbgca - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbgca.uml -InputName=batbgca - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\mg\batbgcg.uml - -!IF "$(CFG)" == "agalib_bagn - Win32 Release" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbgcg.uml -InputName=batbgcg - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbgcg.uml -InputName=batbgcg - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\mg\batbrfc.uml - -!IF "$(CFG)" == "agalib_bagn - Win32 Release" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbrfc.uml -InputName=batbrfc - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbrfc.uml -InputName=batbrfc - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\mg\batbubi.uml - -!IF "$(CFG)" == "agalib_bagn - Win32 Release" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe -InputPath=..\mg\batbubi.uml -InputName=batbubi - -"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - msk32 $(InputPath) $(TargetDir)\$(InputName).msk - -# End Custom Build - -!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" - -# Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed -InputPath=..\mg\batbubi.uml -InputName=batbubi +InputPath=..\include\bagn007.uml +InputName=bagn007 "$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" msk32 $(InputPath) $(TargetDir)\$(InputName).msk diff --git a/projects/authoriz.dsp b/projects/authoriz.dsp index da76c4ae6..b93806d55 100755 --- a/projects/authoriz.dsp +++ b/projects/authoriz.dsp @@ -131,7 +131,7 @@ LINK32=link.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 "..\r020200\server" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\r020200.aga\server" /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -205,17 +205,17 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Authoriz - Win32 Debug DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" +# SUBTRACT BASE RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" # SUBTRACT RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" !ELSEIF "$(CFG)" == "Authoriz - Win32 Release DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\r020200.aga\server" -# SUBTRACT BASE RSC /i "..\r020200\server" /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\wx240\include" -# SUBTRACT RSC /i "..\r020200\server" /i "..\..\wx240\include" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" +# SUBTRACT BASE RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx240\include" +# SUBTRACT RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" !ENDIF diff --git a/projects/ba0.dsp b/projects/ba0.dsp index 17a4901f2..d07e62554 100755 --- a/projects/ba0.dsp +++ b/projects/ba0.dsp @@ -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 /fo"Debug/Ba0.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -121,7 +121,7 @@ SOURCE=..\ba\ba0100a.uml !IF "$(CFG)" == "ba0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba0100a.uml InputName=ba0100a @@ -133,7 +133,7 @@ InputName=ba0100a !ELSEIF "$(CFG)" == "ba0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba0100a.uml InputName=ba0100a @@ -152,7 +152,7 @@ SOURCE=..\ba\ba0200a.uml !IF "$(CFG)" == "ba0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba0200a.uml InputName=ba0200a @@ -164,7 +164,7 @@ InputName=ba0200a !ELSEIF "$(CFG)" == "ba0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba0200a.uml InputName=ba0200a @@ -183,7 +183,7 @@ SOURCE=..\ba\ba0300a.uml !IF "$(CFG)" == "ba0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba0300a.uml InputName=ba0300a @@ -195,7 +195,7 @@ InputName=ba0300a !ELSEIF "$(CFG)" == "ba0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba0300a.uml InputName=ba0300a @@ -214,7 +214,7 @@ SOURCE=..\ba\ba0400a.uml !IF "$(CFG)" == "ba0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba0400a.uml InputName=ba0400a @@ -226,7 +226,7 @@ InputName=ba0400a !ELSEIF "$(CFG)" == "ba0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba0400a.uml InputName=ba0400a @@ -251,7 +251,7 @@ SOURCE=.\Ba0.rc !ELSEIF "$(CFG)" == "ba0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/Ba0.res" +# ADD RSC /l 0x410 /fo"..\Debug/Ba0.res" !ENDIF diff --git a/projects/ba1.dsp b/projects/ba1.dsp index 9b0d29cb2..4f668ef26 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 "\wx234\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -157,7 +157,7 @@ SOURCE=..\ba\ba1100a.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100a.uml InputName=ba1100a @@ -169,7 +169,7 @@ InputName=ba1100a !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100a.uml InputName=ba1100a @@ -188,7 +188,7 @@ SOURCE=..\ba\ba1100b.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100b.uml InputName=ba1100b @@ -200,7 +200,7 @@ InputName=ba1100b !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100b.uml InputName=ba1100b @@ -219,7 +219,7 @@ SOURCE=..\ba\ba1100c.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100c.uml InputName=ba1100c @@ -231,7 +231,7 @@ InputName=ba1100c !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100c.uml InputName=ba1100c @@ -250,7 +250,7 @@ SOURCE=..\ba\ba1100d.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100d.uml InputName=ba1100d @@ -262,7 +262,7 @@ InputName=ba1100d !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100d.uml InputName=ba1100d @@ -281,7 +281,7 @@ SOURCE=..\ba\ba1100e.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100e.uml InputName=ba1100e @@ -293,7 +293,7 @@ InputName=ba1100e !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100e.uml InputName=ba1100e @@ -312,7 +312,7 @@ SOURCE=..\ba\ba1100f.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100f.uml InputName=ba1100f @@ -324,7 +324,7 @@ InputName=ba1100f !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100f.uml InputName=ba1100f @@ -343,7 +343,7 @@ SOURCE=..\ba\ba1100g.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1100g.uml InputName=ba1100g @@ -355,7 +355,7 @@ InputName=ba1100g !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1100g.uml InputName=ba1100g @@ -374,7 +374,7 @@ SOURCE=..\ba\ba1400a.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1400a.uml InputName=ba1400a @@ -386,7 +386,7 @@ InputName=ba1400a !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1400a.uml InputName=ba1400a @@ -405,7 +405,7 @@ SOURCE=..\ba\ba1500a.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1500a.uml InputName=ba1500a @@ -417,7 +417,7 @@ InputName=ba1500a !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1500a.uml InputName=ba1500a @@ -436,7 +436,7 @@ SOURCE=..\ba\ba1500b.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1500b.uml InputName=ba1500b @@ -448,7 +448,7 @@ InputName=ba1500b !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1500b.uml InputName=ba1500b @@ -467,7 +467,7 @@ SOURCE=..\ba\ba1600a.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1600a.uml InputName=ba1600a @@ -479,7 +479,7 @@ InputName=ba1600a !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1600a.uml InputName=ba1600a @@ -498,7 +498,7 @@ SOURCE=..\ba\ba1600b.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1600b.uml InputName=ba1600b @@ -510,7 +510,7 @@ InputName=ba1600b !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1600b.uml InputName=ba1600b @@ -529,7 +529,7 @@ SOURCE=..\ba\ba1800a.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1800a.uml InputName=ba1800a @@ -541,7 +541,7 @@ InputName=ba1800a !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1800a.uml InputName=ba1800a @@ -560,7 +560,7 @@ SOURCE=..\ba\ba1900.uml !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1900.uml InputName=ba1900 @@ -572,7 +572,7 @@ InputName=ba1900 !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1900.uml InputName=ba1900 @@ -599,7 +599,7 @@ SOURCE=..\ba\ba1500a.frm !IF "$(CFG)" == "ba1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba1500a.frm InputName=ba1500a @@ -611,7 +611,7 @@ InputName=ba1500a !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba1500a.frm InputName=ba1500a @@ -632,23 +632,17 @@ SOURCE=.\ba1.rc # ADD BASE RSC /l 0x410 # ADD RSC /l 0x410 -# SUBTRACT RSC /i "\wx234\include" !ELSEIF "$(CFG)" == "ba1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba1.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba1.res" !ENDIF # End Source File # Begin Source File -SOURCE=.\installa.rc -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - SOURCE=..\Lib\AgaLib.lib !IF "$(CFG)" == "ba1 - Win32 Release" diff --git a/projects/ba2.dsp b/projects/ba2.dsp index 30e22f4a6..07a2517c2 100755 --- a/projects/ba2.dsp +++ b/projects/ba2.dsp @@ -137,7 +137,7 @@ SOURCE=..\ba\ba2100a.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100a.uml InputName=ba2100a @@ -149,7 +149,7 @@ InputName=ba2100a !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100a.uml InputName=ba2100a @@ -168,7 +168,7 @@ SOURCE=..\ba\ba2100b.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100b.uml InputName=ba2100b @@ -180,7 +180,7 @@ InputName=ba2100b !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100b.uml InputName=ba2100b @@ -199,7 +199,7 @@ SOURCE=..\ba\ba2100c.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100c.uml InputName=ba2100c @@ -211,7 +211,7 @@ InputName=ba2100c !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100c.uml InputName=ba2100c @@ -230,7 +230,7 @@ SOURCE=..\ba\ba2100f.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100f.uml InputName=ba2100f @@ -242,7 +242,7 @@ InputName=ba2100f !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100f.uml InputName=ba2100f @@ -261,7 +261,7 @@ SOURCE=..\ba\ba2100r.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100r.uml InputName=ba2100r @@ -273,7 +273,7 @@ InputName=ba2100r !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100r.uml InputName=ba2100r @@ -292,7 +292,7 @@ SOURCE=..\ba\ba2100s.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100s.uml InputName=ba2100s @@ -304,7 +304,7 @@ InputName=ba2100s !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100s.uml InputName=ba2100s @@ -323,7 +323,7 @@ SOURCE=..\ba\ba2100u.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2100u.uml InputName=ba2100u @@ -335,7 +335,7 @@ InputName=ba2100u !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2100u.uml InputName=ba2100u @@ -354,7 +354,7 @@ SOURCE=..\ba\ba21dt.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba21dt.uml InputName=ba21dt @@ -366,7 +366,7 @@ InputName=ba21dt !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba21dt.uml InputName=ba21dt @@ -385,7 +385,7 @@ SOURCE=..\ba\ba21fn.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba21fn.uml InputName=ba21fn @@ -397,7 +397,7 @@ InputName=ba21fn !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba21fn.uml InputName=ba21fn @@ -416,7 +416,7 @@ SOURCE=..\ba\ba21nm.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba21nm.uml InputName=ba21nm @@ -428,7 +428,7 @@ InputName=ba21nm !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba21nm.uml InputName=ba21nm @@ -447,7 +447,7 @@ SOURCE=..\ba\ba2200.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2200.uml InputName=ba2200 @@ -459,7 +459,7 @@ InputName=ba2200 !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2200.uml InputName=ba2200 @@ -478,7 +478,7 @@ SOURCE=..\ba\ba2300.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2300.uml InputName=ba2300 @@ -490,7 +490,7 @@ InputName=ba2300 !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2300.uml InputName=ba2300 @@ -509,7 +509,7 @@ SOURCE=..\ba\ba2300a.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2300a.uml InputName=ba2300a @@ -521,7 +521,7 @@ InputName=ba2300a !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2300a.uml InputName=ba2300a @@ -540,7 +540,7 @@ SOURCE=..\ba\ba2300b.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2300b.uml InputName=ba2300b @@ -552,7 +552,7 @@ InputName=ba2300b !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2300b.uml InputName=ba2300b @@ -571,7 +571,7 @@ SOURCE=..\ba\ba2300c.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2300c.uml InputName=ba2300c @@ -583,7 +583,7 @@ InputName=ba2300c !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2300c.uml InputName=ba2300c @@ -602,7 +602,7 @@ SOURCE=..\ba\ba2300d.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2300d.uml InputName=ba2300d @@ -614,7 +614,7 @@ InputName=ba2300d !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2300d.uml InputName=ba2300d @@ -633,7 +633,7 @@ SOURCE=..\ba\ba2500a.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2500a.uml InputName=ba2500a @@ -645,7 +645,7 @@ InputName=ba2500a !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2500a.uml InputName=ba2500a @@ -664,7 +664,7 @@ SOURCE=..\ba\ba2600d.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600d.uml InputName=ba2600d @@ -676,7 +676,7 @@ InputName=ba2600d !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600d.uml InputName=ba2600d @@ -695,7 +695,7 @@ SOURCE=..\ba\ba2600e.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600e.uml InputName=ba2600e @@ -707,7 +707,7 @@ InputName=ba2600e !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600e.uml InputName=ba2600e @@ -726,7 +726,7 @@ SOURCE=..\ba\ba2600g.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600g.uml InputName=ba2600g @@ -738,7 +738,7 @@ InputName=ba2600g !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600g.uml InputName=ba2600g @@ -757,7 +757,7 @@ SOURCE=..\ba\ba2600k.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600k.uml InputName=ba2600k @@ -769,7 +769,7 @@ InputName=ba2600k !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600k.uml InputName=ba2600k @@ -788,7 +788,7 @@ SOURCE=..\ba\ba2600l.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600l.uml InputName=ba2600l @@ -800,7 +800,7 @@ InputName=ba2600l !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600l.uml InputName=ba2600l @@ -819,7 +819,7 @@ SOURCE=..\ba\ba2600m.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600m.uml InputName=ba2600m @@ -831,7 +831,7 @@ InputName=ba2600m !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600m.uml InputName=ba2600m @@ -850,7 +850,7 @@ SOURCE=..\ba\ba2600n.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600n.uml InputName=ba2600n @@ -862,7 +862,7 @@ InputName=ba2600n !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600n.uml InputName=ba2600n @@ -881,7 +881,7 @@ SOURCE=..\ba\ba2600o.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600o.uml InputName=ba2600o @@ -893,7 +893,7 @@ InputName=ba2600o !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600o.uml InputName=ba2600o @@ -912,7 +912,7 @@ SOURCE=..\ba\ba2600p.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600p.uml InputName=ba2600p @@ -924,7 +924,7 @@ InputName=ba2600p !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600p.uml InputName=ba2600p @@ -943,7 +943,7 @@ SOURCE=..\ba\ba2600r.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600r.uml InputName=ba2600r @@ -955,7 +955,7 @@ InputName=ba2600r !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600r.uml InputName=ba2600r @@ -974,7 +974,7 @@ SOURCE=..\ba\ba2600s.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600s.uml InputName=ba2600s @@ -986,7 +986,7 @@ InputName=ba2600s !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600s.uml InputName=ba2600s @@ -1005,7 +1005,7 @@ SOURCE=..\ba\ba2600t.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600t.uml InputName=ba2600t @@ -1017,7 +1017,7 @@ InputName=ba2600t !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600t.uml InputName=ba2600t @@ -1036,7 +1036,7 @@ SOURCE=..\ba\ba2600x.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600x.uml InputName=ba2600x @@ -1048,7 +1048,7 @@ InputName=ba2600x !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600x.uml InputName=ba2600x @@ -1067,7 +1067,7 @@ SOURCE=..\ba\ba2600y.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600y.uml InputName=ba2600y @@ -1079,7 +1079,7 @@ InputName=ba2600y !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600y.uml InputName=ba2600y @@ -1098,7 +1098,7 @@ SOURCE=..\ba\ba2600z.uml !IF "$(CFG)" == "ba2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba2600z.uml InputName=ba2600z @@ -1110,7 +1110,7 @@ InputName=ba2600z !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba2600z.uml InputName=ba2600z @@ -1139,7 +1139,7 @@ SOURCE=.\ba2.rc !ELSEIF "$(CFG)" == "ba2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba2.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba2.res" !ENDIF diff --git a/projects/ba3.dsp b/projects/ba3.dsp index b08eca2ec..367f57296 100755 --- a/projects/ba3.dsp +++ b/projects/ba3.dsp @@ -161,7 +161,7 @@ SOURCE=..\ba\ba3200a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3200a.uml InputName=ba3200a @@ -173,7 +173,7 @@ InputName=ba3200a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3200a.uml InputName=ba3200a @@ -192,7 +192,7 @@ SOURCE=..\ba\ba3300a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3300a.uml InputName=ba3300a @@ -204,7 +204,7 @@ InputName=ba3300a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3300a.uml InputName=ba3300a @@ -223,7 +223,7 @@ SOURCE=..\ba\ba3400a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3400a.uml InputName=ba3400a @@ -235,7 +235,7 @@ InputName=ba3400a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3400a.uml InputName=ba3400a @@ -254,7 +254,7 @@ SOURCE=..\ba\ba3500a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3500a.uml InputName=ba3500a @@ -266,7 +266,7 @@ InputName=ba3500a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3500a.uml InputName=ba3500a @@ -285,7 +285,7 @@ SOURCE=..\ba\ba3600a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3600a.uml InputName=ba3600a @@ -297,7 +297,7 @@ InputName=ba3600a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3600a.uml InputName=ba3600a @@ -316,7 +316,7 @@ SOURCE=..\ba\ba3601a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3601a.uml InputName=ba3601a @@ -328,7 +328,7 @@ InputName=ba3601a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3601a.uml InputName=ba3601a @@ -347,7 +347,7 @@ SOURCE=..\ba\ba3700a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3700a.uml InputName=ba3700a @@ -359,7 +359,7 @@ InputName=ba3700a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3700a.uml InputName=ba3700a @@ -378,7 +378,7 @@ SOURCE=..\ba\ba3800a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3800a.uml InputName=ba3800a @@ -390,7 +390,7 @@ InputName=ba3800a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3800a.uml InputName=ba3800a @@ -409,7 +409,7 @@ SOURCE=..\ba\ba3800b.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3800b.uml InputName=ba3800b @@ -421,7 +421,7 @@ InputName=ba3800b !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3800b.uml InputName=ba3800b @@ -440,7 +440,7 @@ SOURCE=..\ba\ba3a00a.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba3a00a.uml InputName=ba3a00a @@ -452,7 +452,7 @@ InputName=ba3a00a !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba3a00a.uml InputName=ba3a00a @@ -471,7 +471,7 @@ SOURCE=..\ba\batbban.uml !IF "$(CFG)" == "ba3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\batbban.uml InputName=batbban @@ -483,7 +483,7 @@ InputName=batbban !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\batbban.uml InputName=batbban @@ -512,7 +512,7 @@ SOURCE=.\ba3.rc !ELSEIF "$(CFG)" == "ba3 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba3.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba3.res" !ENDIF diff --git a/projects/ba4.dsp b/projects/ba4.dsp index 79f1fd107..6bb6f0465 100755 --- a/projects/ba4.dsp +++ b/projects/ba4.dsp @@ -133,7 +133,7 @@ SOURCE=..\ba\ba4100a.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4100a.uml InputName=ba4100a @@ -145,7 +145,7 @@ InputName=ba4100a !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4100a.uml InputName=ba4100a @@ -164,7 +164,7 @@ SOURCE=..\ba\ba4200b.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4200b.uml InputName=ba4200b @@ -176,7 +176,7 @@ InputName=ba4200b !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4200b.uml InputName=ba4200b @@ -195,7 +195,7 @@ SOURCE=..\ba\ba4200c.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4200c.uml InputName=ba4200c @@ -207,7 +207,7 @@ InputName=ba4200c !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4200c.uml InputName=ba4200c @@ -226,7 +226,7 @@ SOURCE=..\ba\ba4300a.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4300a.uml InputName=ba4300a @@ -238,7 +238,7 @@ InputName=ba4300a !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4300a.uml InputName=ba4300a @@ -257,7 +257,7 @@ SOURCE=..\ba\ba4400a.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4400a.uml InputName=ba4400a @@ -269,7 +269,7 @@ InputName=ba4400a !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4400a.uml InputName=ba4400a @@ -288,7 +288,7 @@ SOURCE=..\ba\ba4500a.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4500a.uml InputName=ba4500a @@ -300,7 +300,7 @@ InputName=ba4500a !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4500a.uml InputName=ba4500a @@ -319,7 +319,7 @@ SOURCE=..\ba\ba4600a.uml !IF "$(CFG)" == "ba4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba4600a.uml InputName=ba4600a @@ -331,7 +331,7 @@ InputName=ba4600a !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba4600a.uml InputName=ba4600a @@ -360,7 +360,7 @@ SOURCE=.\ba4.rc !ELSEIF "$(CFG)" == "ba4 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba4.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba4.res" !ENDIF diff --git a/projects/ba5.dsp b/projects/ba5.dsp index 56de533ca..213a6929a 100755 --- a/projects/ba5.dsp +++ b/projects/ba5.dsp @@ -121,7 +121,7 @@ SOURCE=..\ba\ba5000.uml !IF "$(CFG)" == "ba5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba5000.uml InputName=ba5000 @@ -133,7 +133,7 @@ InputName=ba5000 !ELSEIF "$(CFG)" == "ba5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba5000.uml InputName=ba5000 @@ -152,7 +152,7 @@ SOURCE=..\ba\ba5200a.uml !IF "$(CFG)" == "ba5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba5200a.uml InputName=ba5200a @@ -164,7 +164,7 @@ InputName=ba5200a !ELSEIF "$(CFG)" == "ba5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba5200a.uml InputName=ba5200a @@ -193,7 +193,7 @@ SOURCE=.\ba5.rc !ELSEIF "$(CFG)" == "ba5 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba5.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba5.res" !ENDIF diff --git a/projects/ba6.dsp b/projects/ba6.dsp index 34b2239f1..e6a114578 100755 --- a/projects/ba6.dsp +++ b/projects/ba6.dsp @@ -121,7 +121,7 @@ SOURCE=..\ba\ba6100a.uml !IF "$(CFG)" == "ba6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba6100a.uml InputName=ba6100a @@ -133,7 +133,7 @@ InputName=ba6100a !ELSEIF "$(CFG)" == "ba6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba6100a.uml InputName=ba6100a @@ -152,7 +152,7 @@ SOURCE=..\ba\ba6100b.uml !IF "$(CFG)" == "ba6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba6100b.uml InputName=ba6100b @@ -164,7 +164,7 @@ InputName=ba6100b !ELSEIF "$(CFG)" == "ba6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba6100b.uml InputName=ba6100b @@ -183,7 +183,7 @@ SOURCE=..\ba\ba6200a.uml !IF "$(CFG)" == "ba6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba6200a.uml InputName=ba6200a @@ -195,7 +195,7 @@ InputName=ba6200a !ELSEIF "$(CFG)" == "ba6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba6200a.uml InputName=ba6200a @@ -224,7 +224,7 @@ SOURCE=.\ba6.rc !ELSEIF "$(CFG)" == "ba6 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba6.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba6.res" !ENDIF diff --git a/projects/ba7.dsp b/projects/ba7.dsp index 981ef483f..1b9d75542 100755 --- a/projects/ba7.dsp +++ b/projects/ba7.dsp @@ -121,7 +121,7 @@ SOURCE=..\ba\ba7100a.uml !IF "$(CFG)" == "ba7 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba7100a.uml InputName=ba7100a @@ -133,7 +133,7 @@ InputName=ba7100a !ELSEIF "$(CFG)" == "ba7 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba7100a.uml InputName=ba7100a @@ -152,7 +152,7 @@ SOURCE=..\ba\ba7200a.uml !IF "$(CFG)" == "ba7 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\ba7200a.uml InputName=ba7200a @@ -164,7 +164,7 @@ InputName=ba7200a !ELSEIF "$(CFG)" == "ba7 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\ba7200a.uml InputName=ba7200a @@ -197,7 +197,7 @@ SOURCE=.\ba7.rc !ELSEIF "$(CFG)" == "ba7 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba7.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba7.res" !ENDIF diff --git a/projects/ba8.dsp b/projects/ba8.dsp index 1cc4ef4e8..2ef978b7b 100755 --- a/projects/ba8.dsp +++ b/projects/ba8.dsp @@ -123,7 +123,7 @@ SOURCE=.\ba8.rc !ELSEIF "$(CFG)" == "ba8 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ba8.res" +# ADD RSC /l 0x410 /fo"..\Debug/ba8.res" !ENDIF diff --git a/projects/bacnv.dsp b/projects/bacnv.dsp index 7cd34f684..d9f9175a9 100755 --- a/projects/bacnv.dsp +++ b/projects/bacnv.dsp @@ -127,7 +127,7 @@ SOURCE=.\bacnv.rc !ELSEIF "$(CFG)" == "bacnv - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/bacnv.res" +# ADD RSC /l 0x410 /fo"..\Debug/bacnv.res" !ENDIF diff --git a/projects/bainst.dsp b/projects/bainst.dsp index e457f1f67..0f015ec8d 100755 --- a/projects/bainst.dsp +++ b/projects/bainst.dsp @@ -153,7 +153,7 @@ SOURCE=..\ba\bainst00.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst00.uml InputName=bainst00 @@ -165,7 +165,7 @@ InputName=bainst00 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst00.uml InputName=bainst00 @@ -184,7 +184,7 @@ SOURCE=..\ba\bainst07.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst07.uml InputName=bainst07 @@ -196,7 +196,7 @@ InputName=bainst07 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst07.uml InputName=bainst07 @@ -215,7 +215,7 @@ SOURCE=..\ba\bainst11.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst11.uml InputName=bainst11 @@ -227,7 +227,7 @@ InputName=bainst11 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst11.uml InputName=bainst11 @@ -246,7 +246,7 @@ SOURCE=..\ba\bainst17.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst17.uml InputName=bainst17 @@ -258,7 +258,7 @@ InputName=bainst17 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst17.uml InputName=bainst17 @@ -277,7 +277,7 @@ SOURCE=..\ba\bainst18.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst18.uml InputName=bainst18 @@ -289,7 +289,7 @@ InputName=bainst18 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst18.uml InputName=bainst18 @@ -308,7 +308,7 @@ SOURCE=..\ba\bainst31.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst31.uml InputName=bainst31 @@ -320,7 +320,7 @@ InputName=bainst31 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst31.uml InputName=bainst31 @@ -339,7 +339,7 @@ SOURCE=..\ba\bainst32.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst32.uml InputName=bainst32 @@ -351,7 +351,7 @@ InputName=bainst32 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst32.uml InputName=bainst32 @@ -370,7 +370,7 @@ SOURCE=..\ba\bainst38.uml !IF "$(CFG)" == "bainst - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ba\bainst38.uml InputName=bainst38 @@ -382,7 +382,7 @@ InputName=bainst38 !ELSEIF "$(CFG)" == "bainst - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ba\bainst38.uml InputName=bainst38 @@ -402,8 +402,6 @@ InputName=bainst38 # Begin Source File SOURCE=.\Bainst.rc -# ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 # End Source File # Begin Source File diff --git a/projects/cb6.dsp b/projects/cb6.dsp index ac0be4350..0ca3941e2 100755 --- a/projects/cb6.dsp +++ b/projects/cb6.dsp @@ -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" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "S4DLL_BUILD" /D "S4WIN32" /D "CB6" /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "S4DLL_BUILD" /D "S4WIN32" /D "CB6" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -78,7 +78,7 @@ LINK32=link.exe # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BSC32 /nologo /o"..\debug/Cb6.bsc" LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"..\exed\Cb6D.dll" /pdbtype:sept diff --git a/projects/ce0.dsp b/projects/ce0.dsp index 3975210c9..0f049e730 100755 --- a/projects/ce0.dsp +++ b/projects/ce0.dsp @@ -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 /fo"Debug/ce0.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -133,7 +133,7 @@ SOURCE=..\ce\ce0400a.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce0400a.uml InputName=ce0400a @@ -145,7 +145,7 @@ InputName=ce0400a !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce0400a.uml InputName=ce0400a @@ -164,7 +164,7 @@ SOURCE=..\ce\ce0400b.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce0400b.uml InputName=ce0400b @@ -176,7 +176,7 @@ InputName=ce0400b !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce0400b.uml InputName=ce0400b @@ -195,7 +195,7 @@ SOURCE=..\ce\ce0500a.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce0500a.uml InputName=ce0500a @@ -207,7 +207,7 @@ InputName=ce0500a !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce0500a.uml InputName=ce0500a @@ -226,7 +226,7 @@ SOURCE=..\ce\ce0500b.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce0500b.uml InputName=ce0500b @@ -238,7 +238,7 @@ InputName=ce0500b !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce0500b.uml InputName=ce0500b @@ -257,7 +257,7 @@ SOURCE=..\ce\ce0900a.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce0900a.uml InputName=ce0900a @@ -269,7 +269,7 @@ InputName=ce0900a !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce0900a.uml InputName=ce0900a @@ -288,7 +288,7 @@ SOURCE=..\ce\cestcac.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestcac.uml InputName=cestcac @@ -300,7 +300,7 @@ InputName=cestcac !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestcac.uml InputName=cestcac @@ -319,7 +319,7 @@ SOURCE=..\ce\cestcat.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestcat.uml InputName=cestcat @@ -331,7 +331,7 @@ InputName=cestcat !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestcat.uml InputName=cestcat @@ -350,7 +350,7 @@ SOURCE=..\ce\cestccb.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestccb.uml InputName=cestccb @@ -362,7 +362,7 @@ InputName=cestccb !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestccb.uml InputName=cestccb @@ -381,7 +381,7 @@ SOURCE=..\ce\cestcce.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestcce.uml InputName=cestcce @@ -393,7 +393,7 @@ InputName=cestcce !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestcce.uml InputName=cestcce @@ -412,7 +412,7 @@ SOURCE=..\ce\cestcgr.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestcgr.uml InputName=cestcgr @@ -424,7 +424,7 @@ InputName=cestcgr !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestcgr.uml InputName=cestcgr @@ -443,7 +443,7 @@ SOURCE=..\ce\cestcim.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestcim.uml InputName=cestcim @@ -455,7 +455,7 @@ InputName=cestcim !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestcim.uml InputName=cestcim @@ -474,7 +474,7 @@ SOURCE=..\ce\cestclm.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestclm.uml InputName=cestclm @@ -486,7 +486,7 @@ InputName=cestclm !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestclm.uml InputName=cestclm @@ -505,7 +505,7 @@ SOURCE=..\ce\cestloc.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cestloc.uml InputName=cestloc @@ -517,7 +517,7 @@ InputName=cestloc !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cestloc.uml InputName=cestloc @@ -536,7 +536,7 @@ SOURCE=..\ce\cesttmc.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cesttmc.uml InputName=cesttmc @@ -548,7 +548,7 @@ InputName=cesttmc !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cesttmc.uml InputName=cesttmc @@ -567,7 +567,7 @@ SOURCE=..\ce\cetbcac.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcac.uml InputName=cetbcac @@ -579,7 +579,7 @@ InputName=cetbcac !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcac.uml InputName=cetbcac @@ -598,7 +598,7 @@ SOURCE=..\ce\cetbcat.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcat.uml InputName=cetbcat @@ -610,7 +610,7 @@ InputName=cetbcat !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcat.uml InputName=cetbcat @@ -629,7 +629,7 @@ SOURCE=..\ce\cetbccb.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbccb.uml InputName=cetbccb @@ -641,7 +641,7 @@ InputName=cetbccb !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbccb.uml InputName=cetbccb @@ -660,7 +660,7 @@ SOURCE=..\ce\cetbcce.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcce.uml InputName=cetbcce @@ -672,7 +672,7 @@ InputName=cetbcce !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcce.uml InputName=cetbcce @@ -691,7 +691,7 @@ SOURCE=..\ce\cetbcgr.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcgr.uml InputName=cetbcgr @@ -703,7 +703,7 @@ InputName=cetbcgr !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcgr.uml InputName=cetbcgr @@ -722,7 +722,7 @@ SOURCE=..\ce\cetbcim.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcim.uml InputName=cetbcim @@ -734,7 +734,7 @@ InputName=cetbcim !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcim.uml InputName=cetbcim @@ -753,7 +753,7 @@ SOURCE=..\ce\cetbclm.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbclm.uml InputName=cetbclm @@ -765,7 +765,7 @@ InputName=cetbclm !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbclm.uml InputName=cetbclm @@ -784,7 +784,7 @@ SOURCE=..\ce\cetbloc.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbloc.uml InputName=cetbloc @@ -796,7 +796,7 @@ InputName=cetbloc !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbloc.uml InputName=cetbloc @@ -815,7 +815,7 @@ SOURCE=..\ce\cetbtmc.uml !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbtmc.uml InputName=cetbtmc @@ -827,7 +827,7 @@ InputName=cetbtmc !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbtmc.uml InputName=cetbtmc @@ -854,7 +854,7 @@ SOURCE=..\ce\cetbcac.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcac.rpt InputName=cetbcac @@ -866,7 +866,7 @@ InputName=cetbcac !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcac.rpt InputName=cetbcac @@ -885,7 +885,7 @@ SOURCE=..\ce\cetbcat.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcat.rpt InputName=cetbcat @@ -897,7 +897,7 @@ InputName=cetbcat !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcat.rpt InputName=cetbcat @@ -916,7 +916,7 @@ SOURCE=..\ce\cetbccb.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbccb.rpt InputName=cetbccb @@ -928,7 +928,7 @@ InputName=cetbccb !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbccb.rpt InputName=cetbccb @@ -947,7 +947,7 @@ SOURCE=..\ce\cetbcce.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcce.rpt InputName=cetbcce @@ -959,7 +959,7 @@ InputName=cetbcce !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcce.rpt InputName=cetbcce @@ -978,7 +978,7 @@ SOURCE=..\ce\cetbcgr.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcgr.rpt InputName=cetbcgr @@ -990,7 +990,7 @@ InputName=cetbcgr !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcgr.rpt InputName=cetbcgr @@ -1009,7 +1009,7 @@ SOURCE=..\ce\cetbcim.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbcim.rpt InputName=cetbcim @@ -1021,7 +1021,7 @@ InputName=cetbcim !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbcim.rpt InputName=cetbcim @@ -1040,7 +1040,7 @@ SOURCE=..\ce\cetbclm.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbclm.rpt InputName=cetbclm @@ -1052,7 +1052,7 @@ InputName=cetbclm !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbclm.rpt InputName=cetbclm @@ -1071,7 +1071,7 @@ SOURCE=..\ce\cetbloc.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbloc.rpt InputName=cetbloc @@ -1083,7 +1083,7 @@ InputName=cetbloc !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbloc.rpt InputName=cetbloc @@ -1102,7 +1102,7 @@ SOURCE=..\ce\cetbtmc.rpt !IF "$(CFG)" == "ce0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\cetbtmc.rpt InputName=cetbtmc @@ -1114,7 +1114,7 @@ InputName=cetbtmc !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\cetbtmc.rpt InputName=cetbtmc @@ -1134,12 +1134,12 @@ SOURCE=.\ce0.rc !IF "$(CFG)" == "ce0 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "ce0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ce0.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/ce0.res" !ENDIF diff --git a/projects/ce0.rc b/projects/ce0.rc index 67577a439..73b2f2002 100755 --- a/projects/ce0.rc +++ b/projects/ce0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ce1.dsp b/projects/ce1.dsp index 0c0c1a64b..6633fc900 100755 --- a/projects/ce1.dsp +++ b/projects/ce1.dsp @@ -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 /fo"Debug/ce1.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -141,7 +141,7 @@ SOURCE=..\ce\ce1101a.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1101a.uml InputName=ce1101a @@ -153,7 +153,7 @@ InputName=ce1101a !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1101a.uml InputName=ce1101a @@ -172,7 +172,7 @@ SOURCE=..\ce\ce1101b.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1101b.uml InputName=ce1101b @@ -184,7 +184,7 @@ InputName=ce1101b !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1101b.uml InputName=ce1101b @@ -203,7 +203,7 @@ SOURCE=..\ce\ce1201a.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1201a.uml InputName=ce1201a @@ -215,7 +215,7 @@ InputName=ce1201a !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1201a.uml InputName=ce1201a @@ -234,7 +234,7 @@ SOURCE=..\ce\ce1201b.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1201b.uml InputName=ce1201b @@ -246,7 +246,7 @@ InputName=ce1201b !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1201b.uml InputName=ce1201b @@ -265,7 +265,7 @@ SOURCE=..\ce\ce1301a.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1301a.uml InputName=ce1301a @@ -277,7 +277,7 @@ InputName=ce1301a !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1301a.uml InputName=ce1301a @@ -296,7 +296,7 @@ SOURCE=..\ce\ce1301b.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1301b.uml InputName=ce1301b @@ -308,7 +308,7 @@ InputName=ce1301b !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1301b.uml InputName=ce1301b @@ -327,7 +327,7 @@ SOURCE=..\ce\ce1301c.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1301c.uml InputName=ce1301c @@ -339,7 +339,7 @@ InputName=ce1301c !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1301c.uml InputName=ce1301c @@ -358,7 +358,7 @@ SOURCE=..\ce\ce1301d.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1301d.uml InputName=ce1301d @@ -370,7 +370,7 @@ InputName=ce1301d !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1301d.uml InputName=ce1301d @@ -389,7 +389,7 @@ SOURCE=..\ce\ce1400a.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1400a.uml InputName=ce1400a @@ -401,7 +401,7 @@ InputName=ce1400a !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1400a.uml InputName=ce1400a @@ -420,7 +420,7 @@ SOURCE=..\ce\ce1400b.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1400b.uml InputName=ce1400b @@ -432,7 +432,7 @@ InputName=ce1400b !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1400b.uml InputName=ce1400b @@ -451,7 +451,7 @@ SOURCE=..\ce\ce1400c.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1400c.uml InputName=ce1400c @@ -463,7 +463,7 @@ InputName=ce1400c !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1400c.uml InputName=ce1400c @@ -482,7 +482,7 @@ SOURCE=..\ce\ce1400d.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1400d.uml InputName=ce1400d @@ -494,7 +494,7 @@ InputName=ce1400d !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1400d.uml InputName=ce1400d @@ -513,7 +513,7 @@ SOURCE=..\ce\ce1500a.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1500a.uml InputName=ce1500a @@ -525,7 +525,7 @@ InputName=ce1500a !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1500a.uml InputName=ce1500a @@ -544,7 +544,7 @@ SOURCE=..\ce\ce1500b.uml !IF "$(CFG)" == "ce1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce1500b.uml InputName=ce1500b @@ -556,7 +556,7 @@ InputName=ce1500b !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce1500b.uml InputName=ce1500b @@ -580,12 +580,12 @@ SOURCE=.\ce1.rc !IF "$(CFG)" == "ce1 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "ce1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ce1.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/ce1.res" !ENDIF diff --git a/projects/ce1.rc b/projects/ce1.rc index 67577a439..73b2f2002 100755 --- a/projects/ce1.rc +++ b/projects/ce1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ce2.dsp b/projects/ce2.dsp index d6103dee1..4db143119 100755 --- a/projects/ce2.dsp +++ b/projects/ce2.dsp @@ -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 /fo"Debug/ce2.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -137,7 +137,7 @@ SOURCE=..\ce\ce2100a.uml !IF "$(CFG)" == "ce2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce2100a.uml InputName=ce2100a @@ -149,7 +149,7 @@ InputName=ce2100a !ELSEIF "$(CFG)" == "ce2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce2100a.uml InputName=ce2100a @@ -168,7 +168,7 @@ SOURCE=..\ce\ce2200a.uml !IF "$(CFG)" == "ce2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce2200a.uml InputName=ce2200a @@ -180,7 +180,7 @@ InputName=ce2200a !ELSEIF "$(CFG)" == "ce2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce2200a.uml InputName=ce2200a @@ -199,7 +199,7 @@ SOURCE=..\ce\ce2300a.uml !IF "$(CFG)" == "ce2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce2300a.uml InputName=ce2300a @@ -211,7 +211,7 @@ InputName=ce2300a !ELSEIF "$(CFG)" == "ce2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce2300a.uml InputName=ce2300a @@ -235,12 +235,12 @@ SOURCE=.\ce2.rc !IF "$(CFG)" == "ce2 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "ce2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ce2.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/ce2.res" !ENDIF diff --git a/projects/ce2.rc b/projects/ce2.rc index 67577a439..73b2f2002 100755 --- a/projects/ce2.rc +++ b/projects/ce2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ce3.dsp b/projects/ce3.dsp index 98feb0f26..5d15fec1a 100755 --- a/projects/ce3.dsp +++ b/projects/ce3.dsp @@ -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 /fo"Debug/ce3.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -153,7 +153,7 @@ SOURCE=..\ce\ce3100a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3100a.uml InputName=ce3100a @@ -165,7 +165,7 @@ InputName=ce3100a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3100a.uml InputName=ce3100a @@ -184,7 +184,7 @@ SOURCE=..\ce\ce3200a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3200a.uml InputName=ce3200a @@ -196,7 +196,7 @@ InputName=ce3200a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3200a.uml InputName=ce3200a @@ -215,7 +215,7 @@ SOURCE=..\ce\ce3300a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3300a.uml InputName=ce3300a @@ -227,7 +227,7 @@ InputName=ce3300a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3300a.uml InputName=ce3300a @@ -246,7 +246,7 @@ SOURCE=..\ce\ce3400a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3400a.uml InputName=ce3400a @@ -258,7 +258,7 @@ InputName=ce3400a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3400a.uml InputName=ce3400a @@ -277,7 +277,7 @@ SOURCE=..\ce\ce3500a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3500a.uml InputName=ce3500a @@ -289,7 +289,7 @@ InputName=ce3500a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3500a.uml InputName=ce3500a @@ -308,7 +308,7 @@ SOURCE=..\ce\ce3600a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3600a.uml InputName=ce3600a @@ -320,7 +320,7 @@ InputName=ce3600a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3600a.uml InputName=ce3600a @@ -339,7 +339,7 @@ SOURCE=..\ce\ce3700a.uml !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3700a.uml InputName=ce3700a @@ -351,7 +351,7 @@ InputName=ce3700a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3700a.uml InputName=ce3700a @@ -378,7 +378,7 @@ SOURCE=..\ce\ce3100a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3100a.frm InputName=ce3100a @@ -390,7 +390,7 @@ InputName=ce3100a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3100a.frm InputName=ce3100a @@ -409,7 +409,7 @@ SOURCE=..\ce\ce3200a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3200a.frm InputName=ce3200a @@ -421,7 +421,7 @@ InputName=ce3200a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3200a.frm InputName=ce3200a @@ -440,7 +440,7 @@ SOURCE=..\ce\ce3300a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3300a.frm InputName=ce3300a @@ -452,7 +452,7 @@ InputName=ce3300a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3300a.frm InputName=ce3300a @@ -471,7 +471,7 @@ SOURCE=..\ce\ce3400a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3400a.frm InputName=ce3400a @@ -483,7 +483,7 @@ InputName=ce3400a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3400a.frm InputName=ce3400a @@ -502,7 +502,7 @@ SOURCE=..\ce\ce3500a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3500a.frm InputName=ce3500a @@ -514,7 +514,7 @@ InputName=ce3500a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3500a.frm InputName=ce3500a @@ -533,7 +533,7 @@ SOURCE=..\ce\ce3500b.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3500b.frm InputName=ce3500b @@ -545,7 +545,7 @@ InputName=ce3500b !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3500b.frm InputName=ce3500b @@ -564,7 +564,7 @@ SOURCE=..\ce\ce3600a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3600a.frm InputName=ce3600a @@ -576,7 +576,7 @@ InputName=ce3600a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3600a.frm InputName=ce3600a @@ -595,7 +595,7 @@ SOURCE=..\ce\ce3700a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3700a.frm InputName=ce3700a @@ -607,7 +607,7 @@ InputName=ce3700a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3700a.frm InputName=ce3700a @@ -626,7 +626,7 @@ SOURCE=..\ce\ce3800a.frm !IF "$(CFG)" == "ce3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ce\ce3800a.frm InputName=ce3800a @@ -638,7 +638,7 @@ InputName=ce3800a !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ce\ce3800a.frm InputName=ce3800a @@ -658,12 +658,12 @@ SOURCE=.\ce3.rc !IF "$(CFG)" == "ce3 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "ce3 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ce3.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/ce3.res" !ENDIF diff --git a/projects/ce3.rc b/projects/ce3.rc index 67577a439..73b2f2002 100755 --- a/projects/ce3.rc +++ b/projects/ce3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/cg0.dsp b/projects/cg0.dsp index f266e1ab7..45678e706 100755 --- a/projects/cg0.dsp +++ b/projects/cg0.dsp @@ -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 /fo"Debug/Cg0.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -149,7 +149,7 @@ SOURCE=..\cg\cg0100a.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0100a.uml InputName=cg0100a @@ -161,7 +161,7 @@ InputName=cg0100a !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0100a.uml InputName=cg0100a @@ -180,7 +180,7 @@ SOURCE=..\cg\cg0200a.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0200a.uml InputName=cg0200a @@ -192,7 +192,7 @@ InputName=cg0200a !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0200a.uml InputName=cg0200a @@ -211,7 +211,7 @@ SOURCE=..\cg\cg0200b.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0200b.uml InputName=cg0200b @@ -223,7 +223,7 @@ InputName=cg0200b !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0200b.uml InputName=cg0200b @@ -242,7 +242,7 @@ SOURCE=..\cg\cg0300a.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0300a.uml InputName=cg0300a @@ -254,7 +254,7 @@ InputName=cg0300a !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0300a.uml InputName=cg0300a @@ -273,7 +273,7 @@ SOURCE=..\cg\cg0400a.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0400a.uml InputName=cg0400a @@ -285,7 +285,7 @@ InputName=cg0400a !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0400a.uml InputName=cg0400a @@ -304,7 +304,7 @@ SOURCE=..\cg\cg0400b.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0400b.uml InputName=cg0400b @@ -316,7 +316,7 @@ InputName=cg0400b !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0400b.uml InputName=cg0400b @@ -335,7 +335,7 @@ SOURCE=..\cg\cg0500a.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0500a.uml InputName=cg0500a @@ -347,7 +347,7 @@ InputName=cg0500a !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0500a.uml InputName=cg0500a @@ -366,7 +366,7 @@ SOURCE=..\cg\cg0500b.uml !IF "$(CFG)" == "cg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg0500b.uml InputName=cg0500b @@ -378,7 +378,7 @@ InputName=cg0500b !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg0500b.uml InputName=cg0500b @@ -397,22 +397,6 @@ InputName=cg0500b # End Group # Begin Source File -SOURCE=.\wx\msw\blank.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\bullseye.cur -# End Source File -# Begin Source File - -SOURCE=..\EXE\RES\Campo.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\cdrom.ico -# End Source File -# Begin Source File - SOURCE=.\Cg0.rc !IF "$(CFG)" == "cg0 - Win32 Release" @@ -423,89 +407,13 @@ SOURCE=.\Cg0.rc !ELSEIF "$(CFG)" == "cg0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/Cg0.res" /i "..\wx229\include" +# ADD RSC /l 0x410 /fo"..\Debug/Cg0.res" !ENDIF # End Source File # Begin Source File -SOURCE=.\wx\msw\computer.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\drive.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\file1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\floppy.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder2.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\hand.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\magnif1.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\noentry.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pbrush.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pencil.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntleft.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntright.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\query.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\removble.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\rightarr.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\roller.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\size.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\watch1.cur -# End Source File -# Begin Source File - SOURCE=..\Lib\AgaLib.lib !IF "$(CFG)" == "cg0 - Win32 Release" diff --git a/projects/cg1.dsp b/projects/cg1.dsp index cd72d8624..f05b11602 100755 --- a/projects/cg1.dsp +++ b/projects/cg1.dsp @@ -43,7 +43,7 @@ RSC=rc.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 /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -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 /fo"Debug/cg1.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -181,7 +181,7 @@ SOURCE=..\cg\cg1100a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1100a.uml InputName=cg1100a @@ -193,7 +193,7 @@ InputName=cg1100a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1100a.uml InputName=cg1100a @@ -212,7 +212,7 @@ SOURCE=..\cg\cg1200a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1200a.uml InputName=cg1200a @@ -224,7 +224,7 @@ InputName=cg1200a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1200a.uml InputName=cg1200a @@ -243,7 +243,7 @@ SOURCE=..\cg\cg1200b.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1200b.uml InputName=cg1200b @@ -255,7 +255,7 @@ InputName=cg1200b !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1200b.uml InputName=cg1200b @@ -274,7 +274,7 @@ SOURCE=..\cg\cg1300a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1300a.uml InputName=cg1300a @@ -286,7 +286,7 @@ InputName=cg1300a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1300a.uml InputName=cg1300a @@ -305,7 +305,7 @@ SOURCE=..\cg\cg1300b.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1300b.uml InputName=cg1300b @@ -317,7 +317,7 @@ InputName=cg1300b !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1300b.uml InputName=cg1300b @@ -336,7 +336,7 @@ SOURCE=..\cg\cg1300c.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1300c.uml InputName=cg1300c @@ -348,7 +348,7 @@ InputName=cg1300c !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1300c.uml InputName=cg1300c @@ -367,7 +367,7 @@ SOURCE=..\cg\cg1300d.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1300d.uml InputName=cg1300d @@ -379,7 +379,7 @@ InputName=cg1300d !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1300d.uml InputName=cg1300d @@ -398,7 +398,7 @@ SOURCE=..\cg\cg1300e.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1300e.uml InputName=cg1300e @@ -410,7 +410,7 @@ InputName=cg1300e !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1300e.uml InputName=cg1300e @@ -429,7 +429,7 @@ SOURCE=..\cg\cg1400a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1400a.uml InputName=cg1400a @@ -441,7 +441,7 @@ InputName=cg1400a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1400a.uml InputName=cg1400a @@ -460,7 +460,7 @@ SOURCE=..\cg\cg1500a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1500a.uml InputName=cg1500a @@ -472,7 +472,7 @@ InputName=cg1500a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1500a.uml InputName=cg1500a @@ -491,7 +491,7 @@ SOURCE=..\cg\cg1600a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1600a.uml InputName=cg1600a @@ -503,7 +503,7 @@ InputName=cg1600a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1600a.uml InputName=cg1600a @@ -522,7 +522,7 @@ SOURCE=..\cg\cg1700a.uml !IF "$(CFG)" == "cg1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg1700a.uml InputName=cg1700a @@ -534,7 +534,7 @@ InputName=cg1700a !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg1700a.uml InputName=cg1700a @@ -553,22 +553,6 @@ InputName=cg1700a # End Group # Begin Source File -SOURCE=.\wx\msw\blank.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\bullseye.cur -# End Source File -# Begin Source File - -SOURCE=..\EXE\RES\Campo.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\cdrom.ico -# End Source File -# Begin Source File - SOURCE=.\cg1.rc !IF "$(CFG)" == "cg1 - Win32 Release" @@ -579,89 +563,13 @@ SOURCE=.\cg1.rc !ELSEIF "$(CFG)" == "cg1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cg1.res" +# ADD RSC /l 0x410 /fo"..\Debug/cg1.res" !ENDIF # End Source File # Begin Source File -SOURCE=.\wx\msw\computer.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\drive.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\file1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\floppy.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder2.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\hand.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\magnif1.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\noentry.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pbrush.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pencil.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntleft.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntright.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\query.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\removble.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\rightarr.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\roller.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\size.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\watch1.cur -# End Source File -# Begin Source File - SOURCE=..\Lib\AgaLib.lib !IF "$(CFG)" == "cg1 - Win32 Release" diff --git a/projects/cg2.dsp b/projects/cg2.dsp index c2d19a461..545b1ce27 100755 --- a/projects/cg2.dsp +++ b/projects/cg2.dsp @@ -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 /fo"Debug/cg2.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -157,7 +157,7 @@ SOURCE=..\cg\cg2100a.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100a.uml InputName=cg2100a @@ -169,7 +169,7 @@ InputName=cg2100a !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100a.uml InputName=cg2100a @@ -188,7 +188,7 @@ SOURCE=..\cg\cg2100b.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100b.uml InputName=cg2100b @@ -200,7 +200,7 @@ InputName=cg2100b !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100b.uml InputName=cg2100b @@ -219,7 +219,7 @@ SOURCE=..\cg\cg2100c.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100c.uml InputName=cg2100c @@ -231,7 +231,7 @@ InputName=cg2100c !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100c.uml InputName=cg2100c @@ -250,7 +250,7 @@ SOURCE=..\cg\cg2100i.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100i.uml InputName=cg2100i @@ -262,7 +262,7 @@ InputName=cg2100i !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100i.uml InputName=cg2100i @@ -281,7 +281,7 @@ SOURCE=..\cg\cg2100k.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100k.uml InputName=cg2100k @@ -293,7 +293,7 @@ InputName=cg2100k !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100k.uml InputName=cg2100k @@ -312,7 +312,7 @@ SOURCE=..\cg\cg2100n.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100n.uml InputName=cg2100n @@ -324,7 +324,7 @@ InputName=cg2100n !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100n.uml InputName=cg2100n @@ -343,7 +343,7 @@ SOURCE=..\cg\cg2100o.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100o.uml InputName=cg2100o @@ -355,7 +355,7 @@ InputName=cg2100o !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100o.uml InputName=cg2100o @@ -374,7 +374,7 @@ SOURCE=..\cg\cg2100p.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100p.uml InputName=cg2100p @@ -386,7 +386,7 @@ InputName=cg2100p !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100p.uml InputName=cg2100p @@ -405,7 +405,7 @@ SOURCE=..\cg\cg2100s.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2100s.uml InputName=cg2100s @@ -417,7 +417,7 @@ InputName=cg2100s !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2100s.uml InputName=cg2100s @@ -436,7 +436,7 @@ SOURCE=..\cg\cg2104a.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2104a.uml InputName=cg2104a @@ -448,7 +448,7 @@ InputName=cg2104a !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2104a.uml InputName=cg2104a @@ -467,7 +467,7 @@ SOURCE=..\cg\cg21cg.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg21cg.uml InputName=cg21cg @@ -479,7 +479,7 @@ InputName=cg21cg !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg21cg.uml InputName=cg21cg @@ -498,7 +498,7 @@ SOURCE=..\cg\cg21iva.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg21iva.uml InputName=cg21iva @@ -510,7 +510,7 @@ InputName=cg21iva !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg21iva.uml InputName=cg21iva @@ -529,7 +529,7 @@ SOURCE=..\cg\cg21rata.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg21rata.uml InputName=cg21rata @@ -541,7 +541,7 @@ InputName=cg21rata !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg21rata.uml InputName=cg21rata @@ -560,7 +560,7 @@ SOURCE=..\cg\cg21sld.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg21sld.uml InputName=cg21sld @@ -572,7 +572,7 @@ InputName=cg21sld !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg21sld.uml InputName=cg21sld @@ -591,7 +591,7 @@ SOURCE=..\cg\cg2200a.uml !IF "$(CFG)" == "cg2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg2200a.uml InputName=cg2200a @@ -603,7 +603,7 @@ InputName=cg2200a !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg2200a.uml InputName=cg2200a @@ -632,7 +632,7 @@ SOURCE=.\cg2.rc !ELSEIF "$(CFG)" == "cg2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cg2.res" +# ADD RSC /l 0x410 /fo"..\Debug/cg2.res" !ENDIF diff --git a/projects/cg3.dsp b/projects/cg3.dsp index 50413c2e5..b238a608b 100755 --- a/projects/cg3.dsp +++ b/projects/cg3.dsp @@ -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 /fo"Debug/cg3.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -153,7 +153,7 @@ SOURCE=..\cg\cg3100a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3100a.uml InputName=cg3100a @@ -165,7 +165,7 @@ InputName=cg3100a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3100a.uml InputName=cg3100a @@ -184,7 +184,7 @@ SOURCE=..\cg\cg3100b.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3100b.uml InputName=cg3100b @@ -196,7 +196,7 @@ InputName=cg3100b !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3100b.uml InputName=cg3100b @@ -215,7 +215,7 @@ SOURCE=..\cg\cg3200a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3200a.uml InputName=cg3200a @@ -227,7 +227,7 @@ InputName=cg3200a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3200a.uml InputName=cg3200a @@ -246,7 +246,7 @@ SOURCE=..\cg\cg3300a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3300a.uml InputName=cg3300a @@ -258,7 +258,7 @@ InputName=cg3300a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3300a.uml InputName=cg3300a @@ -277,7 +277,7 @@ SOURCE=..\cg\cg3300b.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3300b.uml InputName=cg3300b @@ -289,7 +289,7 @@ InputName=cg3300b !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3300b.uml InputName=cg3300b @@ -308,7 +308,7 @@ SOURCE=..\cg\cg3300c.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3300c.uml InputName=cg3300c @@ -320,7 +320,7 @@ InputName=cg3300c !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3300c.uml InputName=cg3300c @@ -339,7 +339,7 @@ SOURCE=..\cg\cg3400a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3400a.uml InputName=cg3400a @@ -351,7 +351,7 @@ InputName=cg3400a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3400a.uml InputName=cg3400a @@ -370,7 +370,7 @@ SOURCE=..\cg\cg3400b.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3400b.uml InputName=cg3400b @@ -382,7 +382,7 @@ InputName=cg3400b !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3400b.uml InputName=cg3400b @@ -401,7 +401,7 @@ SOURCE=..\cg\cg3500a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3500a.uml InputName=cg3500a @@ -413,7 +413,7 @@ InputName=cg3500a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3500a.uml InputName=cg3500a @@ -432,7 +432,7 @@ SOURCE=..\cg\cg3600a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3600a.uml InputName=cg3600a @@ -444,7 +444,7 @@ InputName=cg3600a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3600a.uml InputName=cg3600a @@ -463,7 +463,7 @@ SOURCE=..\cg\cg3600b.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3600b.uml InputName=cg3600b @@ -475,7 +475,7 @@ InputName=cg3600b !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3600b.uml InputName=cg3600b @@ -494,7 +494,7 @@ SOURCE=..\cg\cg3700a.uml !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3700a.uml InputName=cg3700a @@ -506,7 +506,7 @@ InputName=cg3700a !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3700a.uml InputName=cg3700a @@ -533,7 +533,7 @@ SOURCE=..\cg\cg3300.frm !IF "$(CFG)" == "cg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg3300.frm InputName=cg3300 @@ -545,7 +545,7 @@ InputName=cg3300 !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # Begin Custom Build - Copying form $(InputPath) to $(TargetDir)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg3300.frm InputName=cg3300 @@ -570,7 +570,7 @@ SOURCE=.\cg3.rc !ELSEIF "$(CFG)" == "cg3 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cg3.res" +# ADD RSC /l 0x410 /fo"..\Debug/cg3.res" !ENDIF diff --git a/projects/cg4.dsp b/projects/cg4.dsp index 685a8fd4e..286492c58 100755 --- a/projects/cg4.dsp +++ b/projects/cg4.dsp @@ -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 /fo"Debug/cg4.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -193,7 +193,7 @@ SOURCE=..\cg\cg4100a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4100a.uml InputName=cg4100a @@ -205,7 +205,7 @@ InputName=cg4100a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4100a.uml InputName=cg4100a @@ -224,7 +224,7 @@ SOURCE=..\cg\cg4100b.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4100b.uml InputName=cg4100b @@ -236,7 +236,7 @@ InputName=cg4100b !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4100b.uml InputName=cg4100b @@ -255,7 +255,7 @@ SOURCE=..\cg\cg4200a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4200a.uml InputName=cg4200a @@ -267,7 +267,7 @@ InputName=cg4200a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4200a.uml InputName=cg4200a @@ -286,7 +286,7 @@ SOURCE=..\cg\cg4300a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4300a.uml InputName=cg4300a @@ -298,7 +298,7 @@ InputName=cg4300a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4300a.uml InputName=cg4300a @@ -317,7 +317,7 @@ SOURCE=..\cg\cg4300b.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4300b.uml InputName=cg4300b @@ -329,7 +329,7 @@ InputName=cg4300b !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4300b.uml InputName=cg4300b @@ -348,7 +348,7 @@ SOURCE=..\cg\cg4300c.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4300c.uml InputName=cg4300c @@ -360,7 +360,7 @@ InputName=cg4300c !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4300c.uml InputName=cg4300c @@ -379,7 +379,7 @@ SOURCE=..\cg\cg4400a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4400a.uml InputName=cg4400a @@ -391,7 +391,7 @@ InputName=cg4400a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4400a.uml InputName=cg4400a @@ -410,7 +410,7 @@ SOURCE=..\cg\cg4400b.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4400b.uml InputName=cg4400b @@ -422,7 +422,7 @@ InputName=cg4400b !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4400b.uml InputName=cg4400b @@ -441,7 +441,7 @@ SOURCE=..\cg\cg4500a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4500a.uml InputName=cg4500a @@ -453,7 +453,7 @@ InputName=cg4500a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4500a.uml InputName=cg4500a @@ -472,7 +472,7 @@ SOURCE=..\cg\cg4500b.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4500b.uml InputName=cg4500b @@ -484,7 +484,7 @@ InputName=cg4500b !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4500b.uml InputName=cg4500b @@ -503,7 +503,7 @@ SOURCE=..\cg\cg4600a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4600a.uml InputName=cg4600a @@ -515,7 +515,7 @@ InputName=cg4600a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4600a.uml InputName=cg4600a @@ -534,7 +534,7 @@ SOURCE=..\cg\cg4700a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4700a.uml InputName=cg4700a @@ -546,7 +546,7 @@ InputName=cg4700a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4700a.uml InputName=cg4700a @@ -565,7 +565,7 @@ SOURCE=..\cg\cg4800a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4800a.uml InputName=cg4800a @@ -577,7 +577,7 @@ InputName=cg4800a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4800a.uml InputName=cg4800a @@ -596,7 +596,7 @@ SOURCE=..\cg\cg4800b.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4800b.uml InputName=cg4800b @@ -608,7 +608,7 @@ InputName=cg4800b !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4800b.uml InputName=cg4800b @@ -627,7 +627,7 @@ SOURCE=..\cg\cg4900a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4900a.uml InputName=cg4900a @@ -639,7 +639,7 @@ InputName=cg4900a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4900a.uml InputName=cg4900a @@ -658,7 +658,7 @@ SOURCE=..\cg\cg4900b.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4900b.uml InputName=cg4900b @@ -670,7 +670,7 @@ InputName=cg4900b !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4900b.uml InputName=cg4900b @@ -689,7 +689,7 @@ SOURCE=..\cg\cg4900c.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4900c.uml InputName=cg4900c @@ -701,7 +701,7 @@ InputName=cg4900c !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4900c.uml InputName=cg4900c @@ -720,7 +720,7 @@ SOURCE=..\cg\cg4900d.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4900d.uml InputName=cg4900d @@ -732,7 +732,7 @@ InputName=cg4900d !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4900d.uml InputName=cg4900d @@ -751,7 +751,7 @@ SOURCE=..\cg\cg4900e.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4900e.uml InputName=cg4900e @@ -763,7 +763,7 @@ InputName=cg4900e !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4900e.uml InputName=cg4900e @@ -782,7 +782,7 @@ SOURCE=..\cg\cg4900f.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4900f.uml InputName=cg4900f @@ -794,7 +794,7 @@ InputName=cg4900f !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4900f.uml InputName=cg4900f @@ -813,7 +813,7 @@ SOURCE=..\cg\cg4a00a.uml !IF "$(CFG)" == "cg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg4a00a.uml InputName=cg4a00a @@ -825,7 +825,7 @@ InputName=cg4a00a !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg4a00a.uml InputName=cg4a00a @@ -854,7 +854,7 @@ SOURCE=.\cg4.rc !ELSEIF "$(CFG)" == "cg4 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cg4.res" +# ADD RSC /l 0x410 /fo"..\Debug/cg4.res" !ENDIF diff --git a/projects/cg5.dsp b/projects/cg5.dsp index ce2b7cf81..498f016e1 100755 --- a/projects/cg5.dsp +++ b/projects/cg5.dsp @@ -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 /fo"Debug/cg5.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -157,7 +157,7 @@ SOURCE=..\cg\cg5000a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5000a.uml InputName=cg5000a @@ -169,7 +169,7 @@ InputName=cg5000a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5000a.uml InputName=cg5000a @@ -188,7 +188,7 @@ SOURCE=..\cg\cg5100a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5100a.uml InputName=cg5100a @@ -200,7 +200,7 @@ InputName=cg5100a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5100a.uml InputName=cg5100a @@ -219,7 +219,7 @@ SOURCE=..\cg\cg5200a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5200a.uml InputName=cg5200a @@ -231,7 +231,7 @@ InputName=cg5200a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5200a.uml InputName=cg5200a @@ -250,7 +250,7 @@ SOURCE=..\cg\cg5300a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5300a.uml InputName=cg5300a @@ -262,7 +262,7 @@ InputName=cg5300a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5300a.uml InputName=cg5300a @@ -281,7 +281,7 @@ SOURCE=..\cg\cg5400a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5400a.uml InputName=cg5400a @@ -293,7 +293,7 @@ InputName=cg5400a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5400a.uml InputName=cg5400a @@ -312,7 +312,7 @@ SOURCE=..\cg\cg5400b.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5400b.uml InputName=cg5400b @@ -324,7 +324,7 @@ InputName=cg5400b !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5400b.uml InputName=cg5400b @@ -343,7 +343,7 @@ SOURCE=..\cg\cg5500a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5500a.uml InputName=cg5500a @@ -355,7 +355,7 @@ InputName=cg5500a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5500a.uml InputName=cg5500a @@ -374,7 +374,7 @@ SOURCE=..\cg\cg5500b.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5500b.uml InputName=cg5500b @@ -386,7 +386,7 @@ InputName=cg5500b !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5500b.uml InputName=cg5500b @@ -405,7 +405,7 @@ SOURCE=..\cg\cg5500c.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5500c.uml InputName=cg5500c @@ -417,7 +417,7 @@ InputName=cg5500c !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5500c.uml InputName=cg5500c @@ -436,7 +436,7 @@ SOURCE=..\cg\cg5500d.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5500d.uml InputName=cg5500d @@ -448,7 +448,7 @@ InputName=cg5500d !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5500d.uml InputName=cg5500d @@ -467,7 +467,7 @@ SOURCE=..\cg\cg5600a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5600a.uml InputName=cg5600a @@ -479,7 +479,7 @@ InputName=cg5600a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5600a.uml InputName=cg5600a @@ -498,7 +498,7 @@ SOURCE=..\cg\cg5700a.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5700a.uml InputName=cg5700a @@ -510,7 +510,7 @@ InputName=cg5700a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5700a.uml InputName=cg5700a @@ -529,7 +529,7 @@ SOURCE=..\cg\cg5700b.uml !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5700b.uml InputName=cg5700b @@ -541,7 +541,7 @@ InputName=cg5700b !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5700b.uml InputName=cg5700b @@ -568,7 +568,7 @@ SOURCE=..\cg\cg5700a.frm !IF "$(CFG)" == "cg5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg5700a.frm InputName=cg5700a @@ -580,7 +580,7 @@ InputName=cg5700a !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg5700a.frm InputName=cg5700a @@ -605,7 +605,7 @@ SOURCE=.\cg5.rc !ELSEIF "$(CFG)" == "cg5 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cg5.res" +# ADD RSC /l 0x410 /fo"..\Debug/cg5.res" !ENDIF diff --git a/projects/cg6.dsp b/projects/cg6.dsp index 4ed2deb8c..d4b59a9fd 100755 --- a/projects/cg6.dsp +++ b/projects/cg6.dsp @@ -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 /fo"Debug/cg6.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -193,7 +193,7 @@ SOURCE=..\cg\cg6400a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6400a.uml InputName=cg6400a @@ -205,7 +205,7 @@ InputName=cg6400a !ELSEIF "$(CFG)" == "cg6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg6400a.uml InputName=cg6400a @@ -224,7 +224,7 @@ SOURCE=..\cg\cg6400b.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6400b.uml InputName=cg6400b @@ -236,7 +236,7 @@ InputName=cg6400b !ELSEIF "$(CFG)" == "cg6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg6400b.uml InputName=cg6400b @@ -255,7 +255,7 @@ SOURCE=..\cg\cg6400c.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6400c.uml InputName=cg6400c @@ -276,7 +276,7 @@ SOURCE=..\cg\cg6600a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6600a.uml InputName=cg6600a @@ -288,7 +288,7 @@ InputName=cg6600a !ELSEIF "$(CFG)" == "cg6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cg\cg6600a.uml InputName=cg6600a @@ -307,7 +307,7 @@ SOURCE=..\cg\cg6700a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6700a.uml InputName=cg6700a @@ -328,7 +328,7 @@ SOURCE=..\cg\cg6800a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6800a.uml InputName=cg6800a @@ -349,7 +349,7 @@ SOURCE=..\cg\cg6800b.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6800b.uml InputName=cg6800b @@ -370,7 +370,7 @@ SOURCE=..\cg\cg6800c.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6800c.uml InputName=cg6800c @@ -391,7 +391,7 @@ SOURCE=..\cg\cg6801a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6801a.uml InputName=cg6801a @@ -412,7 +412,7 @@ SOURCE=..\cg\cg6802a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6802a.uml InputName=cg6802a @@ -433,7 +433,7 @@ SOURCE=..\cg\cg6802b.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6802b.uml InputName=cg6802b @@ -454,7 +454,7 @@ SOURCE=..\cg\cg6803a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6803a.uml InputName=cg6803a @@ -475,7 +475,7 @@ SOURCE=..\cg\cg6804a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804a.uml InputName=cg6804a @@ -496,7 +496,7 @@ SOURCE=..\cg\cg6804b.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804b.uml InputName=cg6804b @@ -517,7 +517,7 @@ SOURCE=..\cg\cg6804c.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804c.uml InputName=cg6804c @@ -538,7 +538,7 @@ SOURCE=..\cg\cg6804d.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804d.uml InputName=cg6804d @@ -559,7 +559,7 @@ SOURCE=..\cg\cg6804e.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804e.uml InputName=cg6804e @@ -580,7 +580,7 @@ SOURCE=..\cg\cg6804f.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804f.uml InputName=cg6804f @@ -601,7 +601,7 @@ SOURCE=..\cg\cg6804g.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6804g.uml InputName=cg6804g @@ -622,7 +622,7 @@ SOURCE=..\cg\cg6900a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6900a.uml InputName=cg6900a @@ -643,7 +643,7 @@ SOURCE=..\cg\cg6900b.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6900b.uml InputName=cg6900b @@ -664,7 +664,7 @@ SOURCE=..\cg\cg6903a.uml !IF "$(CFG)" == "cg6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cg\cg6903a.uml InputName=cg6903a @@ -695,7 +695,7 @@ SOURCE=.\cg6.rc !ELSEIF "$(CFG)" == "cg6 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cg6.res" +# ADD RSC /l 0x410 /fo"..\Debug/cg6.res" !ENDIF diff --git a/projects/cm0.dsp b/projects/cm0.dsp index a329bcff6..7766c847f 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 "\wx229\include" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -117,7 +117,7 @@ SOURCE=..\cm\cm0100a.uml !IF "$(CFG)" == "cm0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cm\cm0100a.uml InputName=cm0100a @@ -129,7 +129,7 @@ InputName=cm0100a !ELSEIF "$(CFG)" == "cm0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cm\cm0100a.uml InputName=cm0100a @@ -148,7 +148,7 @@ SOURCE=..\cm\cm0200a.uml !IF "$(CFG)" == "cm0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cm\cm0200a.uml InputName=cm0200a @@ -160,7 +160,7 @@ InputName=cm0200a !ELSEIF "$(CFG)" == "cm0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cm\cm0200a.uml InputName=cm0200a @@ -187,7 +187,7 @@ SOURCE=..\cm\cm0100a.frm !IF "$(CFG)" == "cm0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cm\cm0100a.frm InputName=cm0100a @@ -199,7 +199,7 @@ InputName=cm0100a !ELSEIF "$(CFG)" == "cm0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cm\cm0100a.frm InputName=cm0100a @@ -218,7 +218,7 @@ SOURCE=..\cm\cm0200a.frm !IF "$(CFG)" == "cm0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\cm\cm0200a.frm InputName=cm0200a @@ -230,7 +230,7 @@ InputName=cm0200a !ELSEIF "$(CFG)" == "cm0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\cm\cm0200a.frm InputName=cm0200a @@ -255,7 +255,7 @@ SOURCE=.\cm0.rc !ELSEIF "$(CFG)" == "cm0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/cm0.res" +# ADD RSC /l 0x410 /fo"..\Debug/cm0.res" !ENDIF diff --git a/projects/cm0.rc b/projects/cm0.rc index 67577a439..73b2f2002 100755 --- a/projects/cm0.rc +++ b/projects/cm0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/coffee.dsp b/projects/coffee.dsp index ae06c55fa..3598727b0 100755 --- a/projects/coffee.dsp +++ b/projects/coffee.dsp @@ -131,7 +131,7 @@ LINK32=link.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 "..\r020200\server" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\r020200.aga\server" /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -189,17 +189,17 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Coffee - Win32 Debug DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" +# SUBTRACT BASE RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" # SUBTRACT RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" !ELSEIF "$(CFG)" == "Coffee - Win32 Release DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\r020200.aga\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\wx240\include" -# SUBTRACT RSC /i "..\r020200\server" /i "..\..\wx240\include" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" +# SUBTRACT BASE RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx240\include" +# SUBTRACT RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" !ENDIF diff --git a/projects/database.dsp b/projects/database.dsp index a5f8de5c5..f33d6c1bf 100755 --- a/projects/database.dsp +++ b/projects/database.dsp @@ -131,7 +131,7 @@ LINK32=link.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 "..\r020200\server" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\r020200.aga\server" /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -189,17 +189,17 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "DataBase - Win32 Debug DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" +# SUBTRACT BASE RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" # SUBTRACT RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" !ELSEIF "$(CFG)" == "DataBase - Win32 Release DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\r020200.aga\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\wx240\include" -# SUBTRACT RSC /i "..\r020200\server" /i "..\..\wx240\include" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" +# SUBTRACT BASE RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx240\include" +# SUBTRACT RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" !ENDIF diff --git a/projects/db0.dsp b/projects/db0.dsp index 34871fd86..86908d366 100755 --- a/projects/db0.dsp +++ b/projects/db0.dsp @@ -137,7 +137,7 @@ SOURCE=..\db\db0100a.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db0100a.uml InputName=db0100a @@ -149,7 +149,7 @@ InputName=db0100a !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db0100a.uml InputName=db0100a @@ -168,7 +168,7 @@ SOURCE=..\db\db0100b.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db0100b.uml InputName=db0100b @@ -180,7 +180,7 @@ InputName=db0100b !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db0100b.uml InputName=db0100b @@ -199,7 +199,7 @@ SOURCE=..\db\db0100c.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db0100c.uml InputName=db0100c @@ -211,7 +211,7 @@ InputName=db0100c !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db0100c.uml InputName=db0100c @@ -230,7 +230,7 @@ SOURCE=..\db\db0500a.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db0500a.uml InputName=db0500a @@ -242,7 +242,7 @@ InputName=db0500a !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db0500a.uml InputName=db0500a @@ -261,7 +261,7 @@ SOURCE=..\db\db0500b.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db0500b.uml InputName=db0500b @@ -273,7 +273,7 @@ InputName=db0500b !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db0500b.uml InputName=db0500b @@ -292,7 +292,7 @@ SOURCE=..\db\db0500c.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db0500c.uml InputName=db0500c @@ -304,7 +304,7 @@ InputName=db0500c !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db0500c.uml InputName=db0500c @@ -323,7 +323,7 @@ SOURCE=..\db\dbstlav.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbstlav.uml InputName=dbstlav @@ -335,7 +335,7 @@ InputName=dbstlav !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbstlav.uml InputName=dbstlav @@ -354,7 +354,7 @@ SOURCE=..\db\dbstord.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbstord.uml InputName=dbstord @@ -366,7 +366,7 @@ InputName=dbstord !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbstord.uml InputName=dbstord @@ -385,7 +385,7 @@ SOURCE=..\db\dbstvar.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbstvar.uml InputName=dbstvar @@ -397,7 +397,7 @@ InputName=dbstvar !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbstvar.uml InputName=dbstvar @@ -416,7 +416,7 @@ SOURCE=..\db\dbtblav.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbtblav.uml InputName=dbtblav @@ -428,7 +428,7 @@ InputName=dbtblav !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbtblav.uml InputName=dbtblav @@ -447,7 +447,7 @@ SOURCE=..\db\dbtbord.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbtbord.uml InputName=dbtbord @@ -459,7 +459,7 @@ InputName=dbtbord !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbtbord.uml InputName=dbtbord @@ -478,7 +478,7 @@ SOURCE=..\db\dbtbvar.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbtbvar.uml InputName=dbtbvar @@ -490,7 +490,7 @@ InputName=dbtbvar !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbtbvar.uml InputName=dbtbvar @@ -517,7 +517,7 @@ SOURCE=..\db\dbtblav.rpt !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbtblav.rpt InputName=dbtblav @@ -529,7 +529,7 @@ InputName=dbtblav !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbtblav.rpt InputName=dbtblav @@ -548,7 +548,7 @@ SOURCE=..\db\dbtbord.rpt !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbtbord.rpt InputName=dbtbord @@ -560,7 +560,7 @@ InputName=dbtbord !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbtbord.rpt InputName=dbtbord @@ -579,7 +579,7 @@ SOURCE=..\db\dbtbvar.rpt !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\dbtbvar.rpt InputName=dbtbvar @@ -591,7 +591,7 @@ InputName=dbtbvar !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\dbtbvar.rpt InputName=dbtbvar @@ -616,7 +616,7 @@ SOURCE=.\db0.rc !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/db0.res" +# ADD RSC /l 0x410 /fo"..\Debug/db0.res" !ENDIF diff --git a/projects/db0.rc b/projects/db0.rc index 67577a439..73b2f2002 100755 --- a/projects/db0.rc +++ b/projects/db0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/db1.dsp b/projects/db1.dsp index c401afaab..c8c6d5f73 100755 --- a/projects/db1.dsp +++ b/projects/db1.dsp @@ -193,7 +193,7 @@ SOURCE=..\db\db1100a.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db1100a.uml InputName=db1100a @@ -205,7 +205,7 @@ InputName=db1100a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db1100a.uml InputName=db1100a @@ -224,7 +224,7 @@ SOURCE=..\db\db1200a.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db1200a.uml InputName=db1200a @@ -236,7 +236,7 @@ InputName=db1200a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db1200a.uml InputName=db1200a @@ -255,7 +255,7 @@ SOURCE=..\db\db1300a.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db1300a.uml InputName=db1300a @@ -267,7 +267,7 @@ InputName=db1300a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db1300a.uml InputName=db1300a @@ -286,7 +286,7 @@ SOURCE=..\db\db1300b.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db1300b.uml InputName=db1300b @@ -298,7 +298,7 @@ InputName=db1300b !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db1300b.uml InputName=db1300b @@ -325,7 +325,7 @@ SOURCE=..\db\db1100a.frm !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db1100a.frm InputName=db1100a @@ -337,7 +337,7 @@ InputName=db1100a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db1100a.frm InputName=db1100a @@ -356,7 +356,7 @@ SOURCE=..\db\db1200a.frm !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db1200a.frm InputName=db1200a @@ -368,7 +368,7 @@ InputName=db1200a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db1200a.frm InputName=db1200a @@ -393,7 +393,7 @@ SOURCE=.\db1.rc !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/db1.res" +# ADD RSC /l 0x410 /fo"..\Debug/db1.res" !ENDIF diff --git a/projects/db1.rc b/projects/db1.rc index 67577a439..73b2f2002 100755 --- a/projects/db1.rc +++ b/projects/db1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/db2.dsp b/projects/db2.dsp index bf4f0499a..c88280e98 100755 --- a/projects/db2.dsp +++ b/projects/db2.dsp @@ -133,7 +133,7 @@ SOURCE=..\db\db2400a.uml !IF "$(CFG)" == "db2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\db\db2400a.uml InputName=db2400a @@ -145,7 +145,7 @@ InputName=db2400a !ELSEIF "$(CFG)" == "db2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\db\db2400a.uml InputName=db2400a @@ -182,7 +182,7 @@ SOURCE=.\db2.rc !ELSEIF "$(CFG)" == "db2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/db2.res" +# ADD RSC /l 0x410 /fo"..\Debug/db2.res" !ENDIF diff --git a/projects/db2.rc b/projects/db2.rc index 67577a439..73b2f2002 100755 --- a/projects/db2.rc +++ b/projects/db2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/diction.dsp b/projects/diction.dsp index 2b68e7800..56658f24c 100755 --- a/projects/diction.dsp +++ b/projects/diction.dsp @@ -131,7 +131,7 @@ LINK32=link.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 "..\r020200\server" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\r020200.aga\server" /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -189,17 +189,17 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Diction - Win32 Debug DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" +# SUBTRACT BASE RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" # SUBTRACT RSC /i "\U\Luca\r020200\server" /i "..\..\wx240\include" !ELSEIF "$(CFG)" == "Diction - Win32 Release DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\r020200.aga\server" -# SUBTRACT BASE RSC /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\wx240\include" -# SUBTRACT RSC /i "..\r020200\server" /i "..\..\wx240\include" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" +# SUBTRACT BASE RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx240\include" +# SUBTRACT RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" !ENDIF diff --git a/projects/ef0.dsp b/projects/ef0.dsp index ea89566ac..abd0cc617 100755 --- a/projects/ef0.dsp +++ b/projects/ef0.dsp @@ -43,7 +43,7 @@ RSC=rc.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 /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -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 /fo"Debug/ef0.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -265,7 +265,7 @@ SOURCE=..\ef\bastbnp.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\bastbnp.uml InputName=bastbnp @@ -277,7 +277,7 @@ InputName=bastbnp !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\bastbnp.uml InputName=bastbnp @@ -296,7 +296,7 @@ SOURCE=..\ef\batbbnp.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\batbbnp.uml InputName=batbbnp @@ -308,7 +308,7 @@ InputName=batbbnp !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\batbbnp.uml InputName=batbbnp @@ -327,7 +327,7 @@ SOURCE=..\ef\ef0100a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0100a.uml InputName=ef0100a @@ -339,7 +339,7 @@ InputName=ef0100a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0100a.uml InputName=ef0100a @@ -358,7 +358,7 @@ SOURCE=..\ef\ef0100b.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0100b.uml InputName=ef0100b @@ -370,7 +370,7 @@ InputName=ef0100b !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0100b.uml InputName=ef0100b @@ -389,7 +389,7 @@ SOURCE=..\ef\ef0100c.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0100c.uml InputName=ef0100c @@ -401,7 +401,7 @@ InputName=ef0100c !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0100c.uml InputName=ef0100c @@ -420,7 +420,7 @@ SOURCE=..\ef\ef0200a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0200a.uml InputName=ef0200a @@ -432,7 +432,7 @@ InputName=ef0200a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0200a.uml InputName=ef0200a @@ -451,7 +451,7 @@ SOURCE=..\ef\ef0200b.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0200b.uml InputName=ef0200b @@ -463,7 +463,7 @@ InputName=ef0200b !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0200b.uml InputName=ef0200b @@ -482,7 +482,7 @@ SOURCE=..\ef\ef0300a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0300a.uml InputName=ef0300a @@ -494,7 +494,7 @@ InputName=ef0300a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0300a.uml InputName=ef0300a @@ -513,7 +513,7 @@ SOURCE=..\ef\ef0300b.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0300b.uml InputName=ef0300b @@ -525,7 +525,7 @@ InputName=ef0300b !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0300b.uml InputName=ef0300b @@ -544,7 +544,7 @@ SOURCE=..\ef\ef0300c.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0300c.uml InputName=ef0300c @@ -556,7 +556,7 @@ InputName=ef0300c !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0300c.uml InputName=ef0300c @@ -575,7 +575,7 @@ SOURCE=..\ef\ef0300d.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0300d.uml InputName=ef0300d @@ -587,7 +587,7 @@ InputName=ef0300d !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0300d.uml InputName=ef0300d @@ -606,7 +606,7 @@ SOURCE=..\ef\ef0400a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0400a.uml InputName=ef0400a @@ -618,7 +618,7 @@ InputName=ef0400a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0400a.uml InputName=ef0400a @@ -637,7 +637,7 @@ SOURCE=..\ef\ef0500a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0500a.uml InputName=ef0500a @@ -649,7 +649,7 @@ InputName=ef0500a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0500a.uml InputName=ef0500a @@ -668,7 +668,7 @@ SOURCE=..\ef\ef0600a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0600a.uml InputName=ef0600a @@ -680,7 +680,7 @@ InputName=ef0600a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0600a.uml InputName=ef0600a @@ -699,7 +699,7 @@ SOURCE=..\ef\ef0800a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0800a.uml InputName=ef0800a @@ -711,7 +711,7 @@ InputName=ef0800a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0800a.uml InputName=ef0800a @@ -730,7 +730,7 @@ SOURCE=..\ef\ef0900a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0900a.uml InputName=ef0900a @@ -742,7 +742,7 @@ InputName=ef0900a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0900a.uml InputName=ef0900a @@ -761,7 +761,7 @@ SOURCE=..\ef\ef0A00a.uml !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ef0A00a.uml InputName=ef0A00a @@ -773,7 +773,7 @@ InputName=ef0A00a !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ef0A00a.uml InputName=ef0A00a @@ -804,7 +804,7 @@ SOURCE=..\ef\dse.frm !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\dse.frm InputName=dse @@ -816,7 +816,7 @@ InputName=dse !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\dse.frm InputName=dse @@ -835,7 +835,7 @@ SOURCE=..\ef\rb.frm !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\rb.frm InputName=rb @@ -847,7 +847,7 @@ InputName=rb !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\rb.frm InputName=rb @@ -866,7 +866,7 @@ SOURCE=..\ef\ribadett.frm !IF "$(CFG)" == "ef0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ef\ribadett.frm InputName=ribadett @@ -878,7 +878,7 @@ InputName=ribadett !ELSEIF "$(CFG)" == "ef0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ef\ribadett.frm InputName=ribadett @@ -893,101 +893,17 @@ InputName=ribadett # End Group # Begin Source File -SOURCE=.\wx\msw\blank.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\bullseye.cur -# End Source File -# Begin Source File - -SOURCE=..\EXE\RES\Campo.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\cdrom.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\computer.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\drive.ico -# End Source File -# Begin Source File - SOURCE=.\Ef0.rc + +!IF "$(CFG)" == "ef0 - Win32 Release" + +!ELSEIF "$(CFG)" == "ef0 - Win32 Debug" + # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" -# End Source File -# Begin Source File +# ADD RSC /l 0x410 /fo"..\Debug/ef0.res" -SOURCE=.\wx\msw\file1.ico -# End Source File -# Begin Source File +!ENDIF -SOURCE=.\wx\msw\floppy.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder2.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\hand.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\magnif1.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\noentry.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pbrush.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pencil.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntleft.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntright.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\query.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\removble.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\rightarr.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\roller.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\size.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\watch1.cur # End Source File # Begin Source File diff --git a/projects/ef0.rc b/projects/ef0.rc index 73b2f2002..67577a439 100755 --- a/projects/ef0.rc +++ b/projects/ef0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude ../../wx240/include/wx/msw/wx.rc +rcinclude wx/msw/wx.rc diff --git a/projects/gfm.dsp b/projects/gfm.dsp index 059ca41b1..ff90f1b5b 100755 --- a/projects/gfm.dsp +++ b/projects/gfm.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 "GFM_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\gfm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GFM_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /I "..\gfm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GFM_EXPORTS" /YX /FD /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -78,7 +78,7 @@ LINK32=link.exe # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BSC32 /nologo /o"..\debug/gfm.bsc" LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /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 /nologo /dll /pdb:"gfm.pdb" /debug /machine:I386 /out:"..\exed\gfm.dll" /pdbtype:sept diff --git a/projects/in0.dsp b/projects/in0.dsp index f0837c5ef..4041b12c1 100755 --- a/projects/in0.dsp +++ b/projects/in0.dsp @@ -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 /fo"Debug/in0.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -141,7 +141,7 @@ SOURCE=..\in\basticc.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\basticc.uml InputName=basticc @@ -153,7 +153,7 @@ InputName=basticc !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\basticc.uml InputName=basticc @@ -172,7 +172,7 @@ SOURCE=..\in\bastimt.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\bastimt.uml InputName=bastimt @@ -184,7 +184,7 @@ InputName=bastimt !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\bastimt.uml InputName=bastimt @@ -203,7 +203,7 @@ SOURCE=..\in\bastint.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\bastint.uml InputName=bastint @@ -215,7 +215,7 @@ InputName=bastint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\bastint.uml InputName=bastint @@ -234,7 +234,7 @@ SOURCE=..\in\bastird.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\bastird.uml InputName=bastird @@ -246,7 +246,7 @@ InputName=bastird !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\bastird.uml InputName=bastird @@ -265,7 +265,7 @@ SOURCE=..\in\batbicc.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbicc.uml InputName=batbicc @@ -277,7 +277,7 @@ InputName=batbicc !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbicc.uml InputName=batbicc @@ -296,7 +296,7 @@ SOURCE=..\in\batbimt.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbimt.uml InputName=batbimt @@ -308,7 +308,7 @@ InputName=batbimt !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbimt.uml InputName=batbimt @@ -327,7 +327,7 @@ SOURCE=..\in\batbint.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbint.uml InputName=batbint @@ -339,7 +339,7 @@ InputName=batbint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbint.uml InputName=batbint @@ -358,7 +358,7 @@ SOURCE=..\in\batbird.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbird.uml InputName=batbird @@ -370,7 +370,7 @@ InputName=batbird !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbird.uml InputName=batbird @@ -389,7 +389,7 @@ SOURCE=..\in\in0100a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0100a.uml InputName=in0100a @@ -401,7 +401,7 @@ InputName=in0100a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0100a.uml InputName=in0100a @@ -420,7 +420,7 @@ SOURCE=..\in\in0200a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0200a.uml InputName=in0200a @@ -432,7 +432,7 @@ InputName=in0200a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0200a.uml InputName=in0200a @@ -451,7 +451,7 @@ SOURCE=..\in\in0500a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0500a.uml InputName=in0500a @@ -463,7 +463,7 @@ InputName=in0500a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0500a.uml InputName=in0500a @@ -482,7 +482,7 @@ SOURCE=..\in\in0500b.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0500b.uml InputName=in0500b @@ -494,7 +494,7 @@ InputName=in0500b !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0500b.uml InputName=in0500b @@ -513,7 +513,7 @@ SOURCE=..\in\in0600a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0600a.uml InputName=in0600a @@ -525,7 +525,7 @@ InputName=in0600a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0600a.uml InputName=in0600a @@ -544,7 +544,7 @@ SOURCE=..\in\in0700a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0700a.uml InputName=in0700a @@ -556,7 +556,7 @@ InputName=in0700a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0700a.uml InputName=in0700a @@ -583,7 +583,7 @@ SOURCE=..\in\batbint.frm !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbint.frm InputName=batbint @@ -595,7 +595,7 @@ InputName=batbint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbint.frm InputName=batbint @@ -614,7 +614,7 @@ SOURCE=..\in\in0100a.frm !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0100a.frm InputName=in0100a @@ -626,7 +626,7 @@ InputName=in0100a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0100a.frm InputName=in0100a @@ -645,7 +645,7 @@ SOURCE=..\in\in0100b.frm !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\in0100b.frm InputName=in0100b @@ -657,7 +657,7 @@ InputName=in0100b !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\in0100b.frm InputName=in0100b @@ -680,7 +680,7 @@ SOURCE=..\in\batbicc.rpt !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbicc.rpt InputName=batbicc @@ -692,7 +692,7 @@ InputName=batbicc !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbicc.rpt InputName=batbicc @@ -711,7 +711,7 @@ SOURCE=..\in\batbimt.rpt !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbimt.rpt InputName=batbimt @@ -723,7 +723,7 @@ InputName=batbimt !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbimt.rpt InputName=batbimt @@ -742,7 +742,7 @@ SOURCE=..\in\batbint.rpt !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbint.rpt InputName=batbint @@ -754,7 +754,7 @@ InputName=batbint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbint.rpt InputName=batbint @@ -773,7 +773,7 @@ SOURCE=..\in\batbird.rpt !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\in\batbird.rpt InputName=batbird @@ -785,7 +785,7 @@ InputName=batbird !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\in\batbird.rpt InputName=batbird @@ -801,8 +801,16 @@ InputName=batbird # Begin Source File SOURCE=.\in0.rc + +!IF "$(CFG)" == "in0 - Win32 Release" + +!ELSEIF "$(CFG)" == "in0 - Win32 Debug" + # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/in0.res" + +!ENDIF + # End Source File # Begin Source File diff --git a/projects/in0.rc b/projects/in0.rc index 67577a439..73b2f2002 100755 --- a/projects/in0.rc +++ b/projects/in0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/lerch.dsp b/projects/lerch.dsp index af006e2ea..fe6bf6518 100755 --- a/projects/lerch.dsp +++ b/projects/lerch.dsp @@ -131,7 +131,7 @@ LINK32=link.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 "..\r020200\server" /i "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x809 /i "..\r020200.aga\server" /i "..\..\wx240\include" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -189,17 +189,17 @@ SOURCE=..\server\server.rc !ELSEIF "$(CFG)" == "Lerch - Win32 Debug DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200\server" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" # SUBTRACT BASE RSC /i "\U\Luca\r020200\server" /i "c:\wx233\include" /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" # SUBTRACT RSC /i "\U\Luca\r020200\server" /i "c:\wx233\include" /i "..\..\wx240\include" !ELSEIF "$(CFG)" == "Lerch - Win32 Release DLL" -# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200\server" -# SUBTRACT BASE RSC /i "..\r020200\server" /i "..\..\wx240\include" -# ADD RSC /l 0x410 /i "\U\Luca\r020200\server" /i "\U\Luca\wx240\include" -# SUBTRACT RSC /i "..\r020200\server" /i "..\..\wx240\include" +# ADD BASE RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\r020200\server" +# SUBTRACT BASE RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" +# ADD RSC /l 0x410 /i "\U\Luca\r020200.aga\server" /i "\U\Luca\wx240\include" +# SUBTRACT RSC /i "..\r020200.aga\server" /i "..\..\wx240\include" !ENDIF diff --git a/projects/mg0.dsp b/projects/mg0.dsp index 06ae3b7a8..c2db5e0cf 100755 --- a/projects/mg0.dsp +++ b/projects/mg0.dsp @@ -149,7 +149,7 @@ SOURCE=..\mg\mg0300a.uml !IF "$(CFG)" == "mg0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg0300a.uml InputName=mg0300a @@ -161,7 +161,7 @@ InputName=mg0300a !ELSEIF "$(CFG)" == "mg0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg0300a.uml InputName=mg0300a @@ -190,7 +190,7 @@ SOURCE=.\mg0.rc !ELSEIF "$(CFG)" == "mg0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mg0.res" +# ADD RSC /l 0x410 /fo"..\Debug/mg0.res" !ENDIF diff --git a/projects/mg0.rc b/projects/mg0.rc index 67577a439..73b2f2002 100755 --- a/projects/mg0.rc +++ b/projects/mg0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/mg1.dsp b/projects/mg1.dsp index 05f0a5b5d..0906e8315 100755 --- a/projects/mg1.dsp +++ b/projects/mg1.dsp @@ -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 "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -153,7 +153,7 @@ SOURCE=..\mg\mg1100.uml !IF "$(CFG)" == "mg1 - Win32 Release" # Begin Custom Build -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg1100.uml InputName=mg1100 @@ -165,7 +165,7 @@ InputName=mg1100 !ELSEIF "$(CFG)" == "mg1 - Win32 Debug" # Begin Custom Build -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg1100.uml InputName=mg1100 @@ -184,7 +184,7 @@ SOURCE=..\mg\mg1100a.uml !IF "$(CFG)" == "mg1 - Win32 Release" # Begin Custom Build -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg1100a.uml InputName=mg1100a @@ -196,7 +196,7 @@ InputName=mg1100a !ELSEIF "$(CFG)" == "mg1 - Win32 Debug" # Begin Custom Build -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg1100a.uml InputName=mg1100a @@ -215,7 +215,7 @@ SOURCE=..\mg\mg1200.uml !IF "$(CFG)" == "mg1 - Win32 Release" # Begin Custom Build -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg1200.uml InputName=mg1200 @@ -227,7 +227,7 @@ InputName=mg1200 !ELSEIF "$(CFG)" == "mg1 - Win32 Debug" # Begin Custom Build -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg1200.uml InputName=mg1200 @@ -246,7 +246,7 @@ SOURCE=..\mg\mg1400.uml !IF "$(CFG)" == "mg1 - Win32 Release" # Begin Custom Build -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg1400.uml InputName=mg1400 @@ -258,7 +258,7 @@ InputName=mg1400 !ELSEIF "$(CFG)" == "mg1 - Win32 Debug" # Begin Custom Build -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg1400.uml InputName=mg1400 @@ -287,7 +287,7 @@ SOURCE=.\mg1.rc !ELSEIF "$(CFG)" == "mg1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mg1.res" +# ADD RSC /l 0x410 /fo"..\Debug/mg1.res" !ENDIF diff --git a/projects/mg1.rc b/projects/mg1.rc index 67577a439..73b2f2002 100755 --- a/projects/mg1.rc +++ b/projects/mg1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/mg3.dsp b/projects/mg3.dsp index 06e63dfde..fda8979e1 100755 --- a/projects/mg3.dsp +++ b/projects/mg3.dsp @@ -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 "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -157,7 +157,7 @@ SOURCE=..\mg\mg3100.uml !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3100.uml InputName=mg3100 @@ -169,7 +169,7 @@ InputName=mg3100 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3100.uml InputName=mg3100 @@ -188,7 +188,7 @@ SOURCE=..\mg\mg3200.uml !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3200.uml InputName=mg3200 @@ -200,7 +200,7 @@ InputName=mg3200 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3200.uml InputName=mg3200 @@ -219,7 +219,7 @@ SOURCE=..\mg\mg3300.uml !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3300.uml InputName=mg3300 @@ -231,7 +231,7 @@ InputName=mg3300 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3300.uml InputName=mg3300 @@ -250,7 +250,7 @@ SOURCE=..\mg\mg3400.uml !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3400.uml InputName=mg3400 @@ -262,7 +262,7 @@ InputName=mg3400 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3400.uml InputName=mg3400 @@ -281,7 +281,7 @@ SOURCE=..\mg\mg3500.uml !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3500.uml InputName=mg3500 @@ -293,7 +293,7 @@ InputName=mg3500 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3500.uml InputName=mg3500 @@ -320,7 +320,7 @@ SOURCE=..\mg\mg3100a.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3100a.frm InputName=mg3100a @@ -332,7 +332,7 @@ InputName=mg3100a !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3100a.frm InputName=mg3100a @@ -351,7 +351,7 @@ SOURCE=..\mg\mg3100aa.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3100aa.frm InputName=mg3100aa @@ -363,7 +363,7 @@ InputName=mg3100aa !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3100aa.frm InputName=mg3100aa @@ -382,7 +382,7 @@ SOURCE=..\mg\mg3100b.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3100b.frm InputName=mg3100b @@ -394,7 +394,7 @@ InputName=mg3100b !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3100b.frm InputName=mg3100b @@ -413,7 +413,7 @@ SOURCE=..\mg\mg3200.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3200.frm InputName=mg3200 @@ -425,7 +425,7 @@ InputName=mg3200 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3200.frm InputName=mg3200 @@ -444,7 +444,7 @@ SOURCE=..\mg\mg3200a.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3200a.frm InputName=mg3200a @@ -456,7 +456,7 @@ InputName=mg3200a !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3200a.frm InputName=mg3200a @@ -475,7 +475,7 @@ SOURCE=..\mg\mg3200b.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3200b.frm InputName=mg3200b @@ -487,7 +487,7 @@ InputName=mg3200b !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3200b.frm InputName=mg3200b @@ -506,7 +506,7 @@ SOURCE=..\mg\mg3300a.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3300a.frm InputName=mg3300a @@ -518,7 +518,7 @@ InputName=mg3300a !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3300a.frm InputName=mg3300a @@ -537,7 +537,7 @@ SOURCE=..\mg\mg3300as.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3300as.frm InputName=mg3300as @@ -549,7 +549,7 @@ InputName=mg3300as !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3300as.frm InputName=mg3300as @@ -568,7 +568,7 @@ SOURCE=..\mg\mg3300b.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3300b.frm InputName=mg3300b @@ -580,7 +580,7 @@ InputName=mg3300b !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3300b.frm InputName=mg3300b @@ -599,7 +599,7 @@ SOURCE=..\mg\mg3300bs.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3300bs.frm InputName=mg3300bs @@ -611,7 +611,7 @@ InputName=mg3300bs !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3300bs.frm InputName=mg3300bs @@ -630,7 +630,7 @@ SOURCE=..\mg\mg3500.frm !IF "$(CFG)" == "mg3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg3500.frm InputName=mg3500 @@ -642,7 +642,7 @@ InputName=mg3500 !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg3500.frm InputName=mg3500 @@ -667,7 +667,7 @@ SOURCE=.\mg3.rc !ELSEIF "$(CFG)" == "mg3 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mg3.res" +# ADD RSC /l 0x410 /fo"..\Debug/mg3.res" !ENDIF diff --git a/projects/mg3.rc b/projects/mg3.rc index 67577a439..73b2f2002 100755 --- a/projects/mg3.rc +++ b/projects/mg3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/mg4.dsp b/projects/mg4.dsp index ad294fbd7..5669bf76e 100755 --- a/projects/mg4.dsp +++ b/projects/mg4.dsp @@ -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 "\wx229\include" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -153,7 +153,7 @@ SOURCE=..\mg\mg4100.uml !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4100.uml InputName=mg4100 @@ -165,7 +165,7 @@ InputName=mg4100 !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4100.uml InputName=mg4100 @@ -184,7 +184,7 @@ SOURCE=..\mg\mg4200.uml !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4200.uml InputName=mg4200 @@ -196,7 +196,7 @@ InputName=mg4200 !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4200.uml InputName=mg4200 @@ -215,7 +215,7 @@ SOURCE=..\mg\mg4300.uml !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4300.uml InputName=mg4300 @@ -227,7 +227,7 @@ InputName=mg4300 !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4300.uml InputName=mg4300 @@ -254,7 +254,7 @@ SOURCE=..\mg\mg4100.frm !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4100.frm InputName=mg4100 @@ -266,7 +266,7 @@ InputName=mg4100 !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4100.frm InputName=mg4100 @@ -285,7 +285,7 @@ SOURCE=..\mg\mg4200a.frm !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4200a.frm InputName=mg4200a @@ -297,7 +297,7 @@ InputName=mg4200a !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4200a.frm InputName=mg4200a @@ -316,7 +316,7 @@ SOURCE=..\mg\mg4200aa.frm !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4200aa.frm InputName=mg4200aa @@ -328,7 +328,7 @@ InputName=mg4200aa !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4200aa.frm InputName=mg4200aa @@ -347,7 +347,7 @@ SOURCE=..\mg\mg4200b.frm !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4200b.frm InputName=mg4200b @@ -359,7 +359,7 @@ InputName=mg4200b !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4200b.frm InputName=mg4200b @@ -378,7 +378,7 @@ SOURCE=..\mg\mg4300.frm !IF "$(CFG)" == "mg4 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\mg4300.frm InputName=mg4300 @@ -390,7 +390,7 @@ InputName=mg4300 !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\mg4300.frm InputName=mg4300 @@ -415,7 +415,7 @@ SOURCE=.\mg4.rc !ELSEIF "$(CFG)" == "mg4 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mg4.res" +# ADD RSC /l 0x410 /fo"..\Debug/mg4.res" !ENDIF diff --git a/projects/mg4.rc b/projects/mg4.rc index 67577a439..73b2f2002 100755 --- a/projects/mg4.rc +++ b/projects/mg4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/mg_masktab.dsp b/projects/mg_masktab.dsp index abc9dce8d..5893fc845 100755 --- a/projects/mg_masktab.dsp +++ b/projects/mg_masktab.dsp @@ -47,7 +47,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 "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,7 +73,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 "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -97,7 +97,7 @@ SOURCE=..\mg\bastcau.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\bastcau.uml InputName=bastcau @@ -109,7 +109,7 @@ InputName=bastcau !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\bastcau.uml InputName=bastcau @@ -128,7 +128,7 @@ SOURCE=..\mg\bastfca.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\bastfca.uml InputName=bastfca @@ -140,7 +140,7 @@ InputName=bastfca !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\bastfca.uml InputName=bastfca @@ -159,7 +159,7 @@ SOURCE=..\mg\bastfcg.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\bastfcg.uml InputName=bastfcg @@ -171,7 +171,7 @@ InputName=bastfcg !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\bastfcg.uml InputName=bastfcg @@ -190,7 +190,7 @@ SOURCE=..\mg\bastrfc.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\bastrfc.uml InputName=bastrfc @@ -202,7 +202,7 @@ InputName=bastrfc !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\bastrfc.uml InputName=bastrfc @@ -221,7 +221,7 @@ SOURCE=..\mg\bastubi.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\bastubi.uml InputName=bastubi @@ -233,7 +233,7 @@ InputName=bastubi !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\bastubi.uml InputName=bastubi @@ -252,7 +252,7 @@ SOURCE=..\mg\batbcau.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbcau.uml InputName=batbcau @@ -264,7 +264,7 @@ InputName=batbcau !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbcau.uml InputName=batbcau @@ -283,7 +283,7 @@ SOURCE=..\mg\batbfca.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbfca.uml InputName=batbfca @@ -295,7 +295,7 @@ InputName=batbfca !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbfca.uml InputName=batbfca @@ -314,7 +314,7 @@ SOURCE=..\mg\batbfcg.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbfcg.uml InputName=batbfcg @@ -326,7 +326,7 @@ InputName=batbfcg !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbfcg.uml InputName=batbfcg @@ -345,7 +345,7 @@ SOURCE=..\mg\batbgca.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbgca.uml InputName=batbgca @@ -357,7 +357,7 @@ InputName=batbgca !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbgca.uml InputName=batbgca @@ -376,7 +376,7 @@ SOURCE=..\mg\batbgcg.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbgcg.uml InputName=batbgcg @@ -388,7 +388,7 @@ InputName=batbgcg !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbgcg.uml InputName=batbgcg @@ -407,7 +407,7 @@ SOURCE=..\mg\batbrfc.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbrfc.uml InputName=batbrfc @@ -419,7 +419,7 @@ InputName=batbrfc !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbrfc.uml InputName=batbrfc @@ -438,7 +438,7 @@ SOURCE=..\mg\batbubi.uml !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbubi.uml InputName=batbubi @@ -450,7 +450,7 @@ InputName=batbubi !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbubi.uml InputName=batbubi @@ -473,7 +473,7 @@ SOURCE=..\mg\batbcau.rpt !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbcau.rpt InputName=batbcau @@ -485,7 +485,7 @@ InputName=batbcau !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbcau.rpt InputName=batbcau @@ -504,7 +504,7 @@ SOURCE=..\mg\batbrfc.rpt !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbrfc.rpt InputName=batbrfc @@ -516,7 +516,7 @@ InputName=batbrfc !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbrfc.rpt InputName=batbrfc @@ -535,7 +535,7 @@ SOURCE=..\mg\batbubi.rpt !IF "$(CFG)" == "mg_masktab - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mg\batbubi.rpt InputName=batbubi @@ -547,7 +547,7 @@ InputName=batbubi !ELSEIF "$(CFG)" == "mg_masktab - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mg\batbubi.rpt InputName=batbubi diff --git a/projects/mr0.dsp b/projects/mr0.dsp index 474be7a28..a532f5dc8 100755 --- a/projects/mr0.dsp +++ b/projects/mr0.dsp @@ -141,7 +141,7 @@ SOURCE=..\mr\mr0400a.uml !IF "$(CFG)" == "mr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr0400a.uml InputName=mr0400a @@ -153,7 +153,7 @@ InputName=mr0400a !ELSEIF "$(CFG)" == "mr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr0400a.uml InputName=mr0400a @@ -172,7 +172,7 @@ SOURCE=..\mr\mrtbfia.uml !IF "$(CFG)" == "mr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mrtbfia.uml InputName=mrtbfia @@ -184,7 +184,7 @@ InputName=mrtbfia !ELSEIF "$(CFG)" == "mr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mrtbfia.uml InputName=mrtbfia @@ -203,7 +203,7 @@ SOURCE=..\mr\mrtbimp.uml !IF "$(CFG)" == "mr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mrtbimp.uml InputName=mrtbimp @@ -215,7 +215,7 @@ InputName=mrtbimp !ELSEIF "$(CFG)" == "mr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mrtbimp.uml InputName=mrtbimp @@ -234,7 +234,7 @@ SOURCE=..\mr\mrtblnp.uml !IF "$(CFG)" == "mr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mrtblnp.uml InputName=mrtblnp @@ -246,7 +246,7 @@ InputName=mrtblnp !ELSEIF "$(CFG)" == "mr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mrtblnp.uml InputName=mrtblnp @@ -275,7 +275,7 @@ SOURCE=.\mr0.rc !ELSEIF "$(CFG)" == "mr0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mr0.res" +# ADD RSC /l 0x410 /fo"..\Debug/mr0.res" !ENDIF diff --git a/projects/mr0.rc b/projects/mr0.rc index 67577a439..73b2f2002 100755 --- a/projects/mr0.rc +++ b/projects/mr0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/mr1.dsp b/projects/mr1.dsp index a0ee626f6..581d1ac5f 100755 --- a/projects/mr1.dsp +++ b/projects/mr1.dsp @@ -189,7 +189,7 @@ SOURCE=..\mr\mr1100a.uml !IF "$(CFG)" == "mr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr1100a.uml InputName=mr1100a @@ -201,7 +201,7 @@ InputName=mr1100a !ELSEIF "$(CFG)" == "mr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr1100a.uml InputName=mr1100a @@ -228,7 +228,7 @@ SOURCE=..\mr\mr1100a.frm !IF "$(CFG)" == "mr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr1100a.frm InputName=mr1100a @@ -240,7 +240,7 @@ InputName=mr1100a !ELSEIF "$(CFG)" == "mr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr1100a.frm InputName=mr1100a @@ -259,7 +259,7 @@ SOURCE=..\mr\mr1100b.frm !IF "$(CFG)" == "mr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr1100b.frm InputName=mr1100b @@ -271,7 +271,7 @@ InputName=mr1100b !ELSEIF "$(CFG)" == "mr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr1100b.frm InputName=mr1100b @@ -296,7 +296,7 @@ SOURCE=.\mr1.rc !ELSEIF "$(CFG)" == "mr1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mr1.res" +# ADD RSC /l 0x410 /fo"..\Debug/mr1.res" !ENDIF diff --git a/projects/mr1.rc b/projects/mr1.rc index 67577a439..73b2f2002 100755 --- a/projects/mr1.rc +++ b/projects/mr1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/mr2.dsp b/projects/mr2.dsp index d7be51008..eda3adfe4 100755 --- a/projects/mr2.dsp +++ b/projects/mr2.dsp @@ -209,7 +209,7 @@ SOURCE=..\mr\mr2100a.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2100a.uml InputName=mr2100a @@ -221,7 +221,7 @@ InputName=mr2100a !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2100a.uml InputName=mr2100a @@ -240,7 +240,7 @@ SOURCE=..\mr\mr2100b.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2100b.uml InputName=mr2100b @@ -252,7 +252,7 @@ InputName=mr2100b !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2100b.uml InputName=mr2100b @@ -271,7 +271,7 @@ SOURCE=..\mr\mr2100c.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2100c.uml InputName=mr2100c @@ -283,7 +283,7 @@ InputName=mr2100c !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2100c.uml InputName=mr2100c @@ -302,7 +302,7 @@ SOURCE=..\mr\mr2200a.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200a.uml InputName=mr2200a @@ -314,7 +314,7 @@ InputName=mr2200a !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200a.uml InputName=mr2200a @@ -333,7 +333,7 @@ SOURCE=..\mr\mr2200b.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200b.uml InputName=mr2200b @@ -345,7 +345,7 @@ InputName=mr2200b !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200b.uml InputName=mr2200b @@ -364,7 +364,7 @@ SOURCE=..\mr\mr2200c.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200c.uml InputName=mr2200c @@ -376,7 +376,7 @@ InputName=mr2200c !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200c.uml InputName=mr2200c @@ -395,7 +395,7 @@ SOURCE=..\mr\mr2200e.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200e.uml InputName=mr2200e @@ -407,7 +407,7 @@ InputName=mr2200e !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200e.uml InputName=mr2200e @@ -426,7 +426,7 @@ SOURCE=..\mr\mr2200f.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200f.uml InputName=mr2200f @@ -438,7 +438,7 @@ InputName=mr2200f !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200f.uml InputName=mr2200f @@ -457,7 +457,7 @@ SOURCE=..\mr\mr2300a.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2300a.uml InputName=mr2300a @@ -469,7 +469,7 @@ InputName=mr2300a !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2300a.uml InputName=mr2300a @@ -488,7 +488,7 @@ SOURCE=..\mr\mr2400a.uml !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2400a.uml InputName=mr2400a @@ -500,7 +500,7 @@ InputName=mr2400a !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2400a.uml InputName=mr2400a @@ -527,7 +527,7 @@ SOURCE=..\mr\mr2200a.frm !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200a.frm InputName=mr2200a @@ -539,7 +539,7 @@ InputName=mr2200a !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200a.frm InputName=mr2200a @@ -558,7 +558,7 @@ SOURCE=..\mr\mr2200b.frm !IF "$(CFG)" == "mr2 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\mr\mr2200b.frm InputName=mr2200b @@ -570,7 +570,7 @@ InputName=mr2200b !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\mr\mr2200b.frm InputName=mr2200b @@ -595,7 +595,7 @@ SOURCE=.\mr2.rc !ELSEIF "$(CFG)" == "mr2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/mr2.res" +# ADD RSC /l 0x410 /fo"..\Debug/mr2.res" !ENDIF diff --git a/projects/mr2.rc b/projects/mr2.rc index 67577a439..73b2f2002 100755 --- a/projects/mr2.rc +++ b/projects/mr2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/or1.dsp b/projects/or1.dsp index 64c54c4f8..98c4f8ffe 100755 --- a/projects/or1.dsp +++ b/projects/or1.dsp @@ -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 /fo"Debug/or1.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -193,7 +193,7 @@ SOURCE=..\or\or1100a.uml !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1100a.uml InputName=or1100a @@ -205,7 +205,7 @@ InputName=or1100a !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1100a.uml InputName=or1100a @@ -224,7 +224,7 @@ SOURCE=..\or\or1200a.uml !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1200a.uml InputName=or1200a @@ -236,7 +236,7 @@ InputName=or1200a !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1200a.uml InputName=or1200a @@ -263,7 +263,7 @@ SOURCE=..\or\or1100a.frm !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1100a.frm InputName=or1100a @@ -275,7 +275,7 @@ InputName=or1100a !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1100a.frm InputName=or1100a @@ -294,7 +294,7 @@ SOURCE=..\or\or1100b.frm !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1100b.frm InputName=or1100b @@ -306,7 +306,7 @@ InputName=or1100b !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1100b.frm InputName=or1100b @@ -325,7 +325,7 @@ SOURCE=..\or\or1100c.frm !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1100c.frm InputName=or1100c @@ -337,7 +337,7 @@ InputName=or1100c !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1100c.frm InputName=or1100c @@ -356,7 +356,7 @@ SOURCE=..\or\or1100d.frm !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1100d.frm InputName=or1100d @@ -368,7 +368,7 @@ InputName=or1100d !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1100d.frm InputName=or1100d @@ -387,7 +387,7 @@ SOURCE=..\or\or1200a.frm !IF "$(CFG)" == "or1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\or\or1200a.frm InputName=or1200a @@ -399,7 +399,7 @@ InputName=or1200a !ELSEIF "$(CFG)" == "or1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\or\or1200a.frm InputName=or1200a @@ -415,8 +415,16 @@ InputName=or1200a # Begin Source File SOURCE=.\or1.rc + +!IF "$(CFG)" == "or1 - Win32 Release" + +!ELSEIF "$(CFG)" == "or1 - Win32 Debug" + # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/or1.res" + +!ENDIF + # End Source File # Begin Source File diff --git a/projects/or1.rc b/projects/or1.rc index 67577a439..73b2f2002 100755 --- a/projects/or1.rc +++ b/projects/or1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/pr0.dsp b/projects/pr0.dsp index cfd08d2e4..4af4205ce 100755 --- a/projects/pr0.dsp +++ b/projects/pr0.dsp @@ -209,7 +209,7 @@ SOURCE=..\pr\pr0500a.uml !IF "$(CFG)" == "pr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr0500a.uml InputName=pr0500a @@ -221,7 +221,7 @@ InputName=pr0500a !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr0500a.uml InputName=pr0500a @@ -240,7 +240,7 @@ SOURCE=..\pr\pr0600a.uml !IF "$(CFG)" == "pr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr0600a.uml InputName=pr0600a @@ -252,7 +252,7 @@ InputName=pr0600a !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr0600a.uml InputName=pr0600a @@ -271,7 +271,7 @@ SOURCE=..\pr\pr0700a.uml !IF "$(CFG)" == "pr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr0700a.uml InputName=pr0700a @@ -283,7 +283,7 @@ InputName=pr0700a !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr0700a.uml InputName=pr0700a @@ -302,7 +302,7 @@ SOURCE=..\pr\pr0700b.uml !IF "$(CFG)" == "pr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr0700b.uml InputName=pr0700b @@ -314,7 +314,7 @@ InputName=pr0700b !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr0700b.uml InputName=pr0700b @@ -333,7 +333,7 @@ SOURCE=..\pr\prtbapr.uml !IF "$(CFG)" == "pr0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\prtbapr.uml InputName=prtbapr @@ -345,7 +345,7 @@ InputName=prtbapr !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\prtbapr.uml InputName=prtbapr @@ -376,7 +376,7 @@ SOURCE=..\pr\prtbapr.rpt !IF "$(CFG)" == "pr0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\prtbapr.rpt InputName=prtbapr @@ -388,7 +388,7 @@ InputName=prtbapr !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\prtbapr.rpt InputName=prtbapr @@ -413,7 +413,7 @@ SOURCE=.\pr0.rc !ELSEIF "$(CFG)" == "pr0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/pr0.res" +# ADD RSC /l 0x410 /fo"..\Debug/pr0.res" !ENDIF diff --git a/projects/pr0.rc b/projects/pr0.rc index 67577a439..73b2f2002 100755 --- a/projects/pr0.rc +++ b/projects/pr0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/pr1.dsp b/projects/pr1.dsp index 93fddee30..6c709299f 100755 --- a/projects/pr1.dsp +++ b/projects/pr1.dsp @@ -201,7 +201,7 @@ SOURCE=..\pr\pr1100.uml !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1100.uml InputName=pr1100 @@ -213,7 +213,7 @@ InputName=pr1100 !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1100.uml InputName=pr1100 @@ -232,7 +232,7 @@ SOURCE=..\pr\pr1200a.uml !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1200a.uml InputName=pr1200a @@ -244,7 +244,7 @@ InputName=pr1200a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1200a.uml InputName=pr1200a @@ -263,7 +263,7 @@ SOURCE=..\pr\pr1300a.uml !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1300a.uml InputName=pr1300a @@ -275,7 +275,7 @@ InputName=pr1300a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1300a.uml InputName=pr1300a @@ -294,7 +294,7 @@ SOURCE=..\pr\pr1400.uml !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1400.uml InputName=pr1400 @@ -306,7 +306,7 @@ InputName=pr1400 !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1400.uml InputName=pr1400 @@ -325,7 +325,7 @@ SOURCE=..\pr\pr1500a.uml !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1500a.uml InputName=pr1500a @@ -337,7 +337,7 @@ InputName=pr1500a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1500a.uml InputName=pr1500a @@ -356,7 +356,7 @@ SOURCE=..\pr\prstapr.uml !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\prstapr.uml InputName=prstapr @@ -368,7 +368,7 @@ InputName=prstapr !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\prstapr.uml InputName=prstapr @@ -399,7 +399,7 @@ SOURCE=..\pr\pr1100a.frm !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1100a.frm InputName=pr1100a @@ -411,7 +411,7 @@ InputName=pr1100a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1100a.frm InputName=pr1100a @@ -430,7 +430,7 @@ SOURCE=..\pr\pr1200a.frm !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1200a.frm InputName=pr1200a @@ -442,7 +442,7 @@ InputName=pr1200a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1200a.frm InputName=pr1200a @@ -461,7 +461,7 @@ SOURCE=..\pr\pr1300a.frm !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1300a.frm InputName=pr1300a @@ -473,7 +473,7 @@ InputName=pr1300a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1300a.frm InputName=pr1300a @@ -492,7 +492,7 @@ SOURCE=..\pr\pr1400a.frm !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1400a.frm InputName=pr1400a @@ -504,7 +504,7 @@ InputName=pr1400a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1400a.frm InputName=pr1400a @@ -523,7 +523,7 @@ SOURCE=..\pr\pr1500a.frm !IF "$(CFG)" == "pr1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\pr\pr1500a.frm InputName=pr1500a @@ -535,7 +535,7 @@ InputName=pr1500a !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\pr\pr1500a.frm InputName=pr1500a @@ -560,7 +560,7 @@ SOURCE=.\pr1.rc !ELSEIF "$(CFG)" == "pr1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/pr1.res" +# ADD RSC /l 0x410 /fo"..\Debug/pr1.res" !ENDIF diff --git a/projects/pr1.rc b/projects/pr1.rc index 67577a439..73b2f2002 100755 --- a/projects/pr1.rc +++ b/projects/pr1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/sc0.dsp b/projects/sc0.dsp index 5083480ab..66363e5ac 100755 --- a/projects/sc0.dsp +++ b/projects/sc0.dsp @@ -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 /fo"Debug/sc0.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -129,7 +129,7 @@ SOURCE=..\sc\sc0100a.uml !IF "$(CFG)" == "sc0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc0100a.uml InputName=sc0100a @@ -141,7 +141,7 @@ InputName=sc0100a !ELSEIF "$(CFG)" == "sc0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc0100a.uml InputName=sc0100a @@ -160,7 +160,7 @@ SOURCE=..\sc\sc0100b.uml !IF "$(CFG)" == "sc0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc0100b.uml InputName=sc0100b @@ -172,7 +172,7 @@ InputName=sc0100b !ELSEIF "$(CFG)" == "sc0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc0100b.uml InputName=sc0100b @@ -191,7 +191,7 @@ SOURCE=..\sc\sc0100c.uml !IF "$(CFG)" == "sc0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc0100c.uml InputName=sc0100c @@ -203,7 +203,7 @@ InputName=sc0100c !ELSEIF "$(CFG)" == "sc0 - Win32 Debug" # Begin Custom Build - Compiling masl $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc0100c.uml InputName=sc0100c @@ -222,7 +222,7 @@ SOURCE=..\sc\sc0100p.uml !IF "$(CFG)" == "sc0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc0100p.uml InputName=sc0100p @@ -234,7 +234,7 @@ InputName=sc0100p !ELSEIF "$(CFG)" == "sc0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc0100p.uml InputName=sc0100p @@ -253,115 +253,23 @@ InputName=sc0100p # End Group # Begin Source File -SOURCE=.\wx\msw\blank.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\bullseye.cur -# End Source File -# Begin Source File - -SOURCE=..\EXE\RES\Campo.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\cdrom.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\computer.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\drive.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\file1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\floppy.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder2.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\hand.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\magnif1.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\noentry.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pbrush.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pencil.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntleft.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntright.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\query.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\removble.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\rightarr.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\roller.cur -# End Source File -# Begin Source File - SOURCE=.\sc0.rc !IF "$(CFG)" == "sc0 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "sc0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sc0.res" +# ADD RSC /l 0x410 /fo"..\Debug/sc0.res" !ENDIF # End Source File # Begin Source File -SOURCE=.\wx\msw\size.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\watch1.cur -# End Source File -# Begin Source File - SOURCE=..\Lib\AgaLib.lib !IF "$(CFG)" == "sc0 - Win32 Release" diff --git a/projects/sc1.dsp b/projects/sc1.dsp index 5716744fc..df856c2f8 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 "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "\wx229\include" /i "..\..\wx240\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 /fo"Debug/sc1.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -137,7 +137,7 @@ SOURCE=..\sc\sc1100a.uml !IF "$(CFG)" == "sc1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc1100a.uml InputName=sc1100a @@ -149,7 +149,7 @@ InputName=sc1100a !ELSEIF "$(CFG)" == "sc1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc1100a.uml InputName=sc1100a @@ -168,7 +168,7 @@ SOURCE=..\sc\sc1200a.uml !IF "$(CFG)" == "sc1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc1200a.uml InputName=sc1200a @@ -180,7 +180,7 @@ InputName=sc1200a !ELSEIF "$(CFG)" == "sc1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc1200a.uml InputName=sc1200a @@ -199,7 +199,7 @@ SOURCE=..\sc\sc1300a.uml !IF "$(CFG)" == "sc1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc1300a.uml InputName=sc1300a @@ -211,7 +211,7 @@ InputName=sc1300a !ELSEIF "$(CFG)" == "sc1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc1300a.uml InputName=sc1300a @@ -235,12 +235,12 @@ SOURCE=.\sc1.rc !IF "$(CFG)" == "sc1 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "sc1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sc1.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/sc1.res" !ENDIF diff --git a/projects/sc2.dsp b/projects/sc2.dsp index 25027b663..104e2c549 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 "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "\wx229\include" /i "..\..\wx240\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 /fo"Debug/sc2.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -165,7 +165,7 @@ SOURCE=..\sc\sc2100a.uml !IF "$(CFG)" == "sc2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc2100a.uml InputName=sc2100a @@ -177,7 +177,7 @@ InputName=sc2100a !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc2100a.uml InputName=sc2100a @@ -196,7 +196,7 @@ SOURCE=..\sc\sc2200a.uml !IF "$(CFG)" == "sc2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc2200a.uml InputName=sc2200a @@ -208,7 +208,7 @@ InputName=sc2200a !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc2200a.uml InputName=sc2200a @@ -227,7 +227,7 @@ SOURCE=..\sc\sc2300a.uml !IF "$(CFG)" == "sc2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc2300a.uml InputName=sc2300a @@ -239,7 +239,7 @@ InputName=sc2300a !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc2300a.uml InputName=sc2300a @@ -258,7 +258,7 @@ SOURCE=..\sc\sc2400a.uml !IF "$(CFG)" == "sc2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc2400a.uml InputName=sc2400a @@ -270,7 +270,7 @@ InputName=sc2400a !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc2400a.uml InputName=sc2400a @@ -289,7 +289,7 @@ SOURCE=..\sc\sc2500.uml !IF "$(CFG)" == "sc2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc2500.uml InputName=sc2500 @@ -301,7 +301,7 @@ InputName=sc2500 !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc2500.uml InputName=sc2500 @@ -328,7 +328,7 @@ SOURCE=..\sc\pec.frm !IF "$(CFG)" == "sc2 - Win32 Release" # Begin Custom Build - Copying form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\pec.frm InputName=pec @@ -340,7 +340,7 @@ InputName=pec !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # Begin Custom Build - Copying form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\pec.frm InputName=pec @@ -360,12 +360,12 @@ SOURCE=.\sc2.rc !IF "$(CFG)" == "sc2 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "sc2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sc2.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/sc2.res" !ENDIF diff --git a/projects/sc3.dsp b/projects/sc3.dsp index b70965b29..c09011dc3 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 "..\..\wx240\include" /d "NDEBUG" +# ADD RSC /l 0x410 /i "\wx229\include" /i "..\..\wx240\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 /fo"Debug/sc3.res" /i "..\..\wx240\include" /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -117,7 +117,7 @@ SOURCE=..\sc\sc3100a.uml !IF "$(CFG)" == "sc3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc3100a.uml InputName=sc3100a @@ -129,7 +129,7 @@ InputName=sc3100a !ELSEIF "$(CFG)" == "sc3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc3100a.uml InputName=sc3100a @@ -148,7 +148,7 @@ SOURCE=..\sc\sc3100b.uml !IF "$(CFG)" == "sc3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc3100b.uml InputName=sc3100b @@ -160,7 +160,7 @@ InputName=sc3100b !ELSEIF "$(CFG)" == "sc3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc3100b.uml InputName=sc3100b @@ -179,7 +179,7 @@ SOURCE=..\sc\sc3100c.uml !IF "$(CFG)" == "sc3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc3100c.uml InputName=sc3100c @@ -191,7 +191,7 @@ InputName=sc3100c !ELSEIF "$(CFG)" == "sc3 - Win32 Debug" # Begin Custom Build - Compiling masl $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc3100c.uml InputName=sc3100c @@ -210,7 +210,7 @@ SOURCE=..\sc\sc3100s.uml !IF "$(CFG)" == "sc3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sc\sc3100s.uml InputName=sc3100s @@ -222,7 +222,7 @@ InputName=sc3100s !ELSEIF "$(CFG)" == "sc3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sc\sc3100s.uml InputName=sc3100s @@ -237,115 +237,23 @@ InputName=sc3100s # End Group # Begin Source File -SOURCE=.\wx\msw\blank.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\bullseye.cur -# End Source File -# Begin Source File - -SOURCE=..\EXE\RES\Campo.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\cdrom.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\computer.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\drive.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\file1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\floppy.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder2.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\hand.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\magnif1.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\noentry.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pbrush.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pencil.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntleft.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntright.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\query.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\removble.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\rightarr.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\roller.cur -# End Source File -# Begin Source File - SOURCE=.\sc3.rc !IF "$(CFG)" == "sc3 - Win32 Release" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /i "..\..\wx234\include" +# ADD RSC /l 0x410 !ELSEIF "$(CFG)" == "sc3 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sc3.res" /i "..\..\wx234\include" +# ADD RSC /l 0x410 /fo"..\Debug/sc3.res" !ENDIF # End Source File # Begin Source File -SOURCE=.\wx\msw\size.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\watch1.cur -# End Source File -# Begin Source File - SOURCE=..\Lib\AgaLib.lib !IF "$(CFG)" == "sc3 - Win32 Release" diff --git a/projects/sv0.dsp b/projects/sv0.dsp index 636fabd82..54c3f43de 100755 --- a/projects/sv0.dsp +++ b/projects/sv0.dsp @@ -193,7 +193,7 @@ SOURCE=..\sv\sv0400a.uml !IF "$(CFG)" == "sv0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv0400a.uml InputName=sv0400a @@ -205,7 +205,7 @@ InputName=sv0400a !ELSEIF "$(CFG)" == "sv0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv0400a.uml InputName=sv0400a @@ -234,7 +234,7 @@ SOURCE=.\sv0.rc !ELSEIF "$(CFG)" == "sv0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sv0.res" +# ADD RSC /l 0x410 /fo"..\Debug/sv0.res" !ENDIF diff --git a/projects/sv0.rc b/projects/sv0.rc index 67577a439..73b2f2002 100755 --- a/projects/sv0.rc +++ b/projects/sv0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/sv1.dsp b/projects/sv1.dsp index 940d97bbb..8d7e0f891 100755 --- a/projects/sv1.dsp +++ b/projects/sv1.dsp @@ -193,7 +193,7 @@ SOURCE=..\sv\sv1100a.uml !IF "$(CFG)" == "sv1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv1100a.uml InputName=sv1100a @@ -205,7 +205,7 @@ InputName=sv1100a !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv1100a.uml InputName=sv1100a @@ -224,7 +224,7 @@ SOURCE=..\sv\sv1200a.uml !IF "$(CFG)" == "sv1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv1200a.uml InputName=sv1200a @@ -236,7 +236,7 @@ InputName=sv1200a !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv1200a.uml InputName=sv1200a @@ -255,7 +255,7 @@ SOURCE=..\sv\sv1200b.uml !IF "$(CFG)" == "sv1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv1200b.uml InputName=sv1200b @@ -267,7 +267,7 @@ InputName=sv1200b !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv1200b.uml InputName=sv1200b @@ -286,7 +286,7 @@ SOURCE=..\sv\sv1200c.uml !IF "$(CFG)" == "sv1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputName)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv1200c.uml InputName=sv1200c @@ -298,7 +298,7 @@ InputName=sv1200c !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv1200c.uml InputName=sv1200c @@ -325,7 +325,7 @@ SOURCE=..\sv\sv1100a.frm !IF "$(CFG)" == "sv1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv1100a.frm InputName=sv1100a @@ -337,7 +337,7 @@ InputName=sv1100a !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv1100a.frm InputName=sv1100a @@ -356,7 +356,7 @@ SOURCE=..\sv\sv1100b.frm !IF "$(CFG)" == "sv1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv1100b.frm InputName=sv1100b @@ -368,7 +368,7 @@ InputName=sv1100b !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv1100b.frm InputName=sv1100b @@ -393,7 +393,7 @@ SOURCE=.\sv1.rc !ELSEIF "$(CFG)" == "sv1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sv1.res" +# ADD RSC /l 0x410 /fo"..\Debug/sv1.res" !ENDIF diff --git a/projects/sv2.dsp b/projects/sv2.dsp index 17e98c27c..4de6d1e99 100755 --- a/projects/sv2.dsp +++ b/projects/sv2.dsp @@ -189,7 +189,7 @@ SOURCE=..\sv\sv2100a.uml !IF "$(CFG)" == "sv2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\sv2100a.uml InputName=sv2100a @@ -201,7 +201,7 @@ InputName=sv2100a !ELSEIF "$(CFG)" == "sv2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\sv2100a.uml InputName=sv2100a @@ -220,7 +220,7 @@ SOURCE=..\sv\svtbpsv.uml !IF "$(CFG)" == "sv2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\sv\svtbpsv.uml InputName=svtbpsv @@ -232,7 +232,7 @@ InputName=svtbpsv !ELSEIF "$(CFG)" == "sv2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\sv\svtbpsv.uml InputName=svtbpsv @@ -261,7 +261,7 @@ SOURCE=.\sv2.rc !ELSEIF "$(CFG)" == "sv2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/sv2.res" +# ADD RSC /l 0x410 /fo"..\Debug/sv2.res" !ENDIF diff --git a/projects/sv2.rc b/projects/sv2.rc index 67577a439..73b2f2002 100755 --- a/projects/sv2.rc +++ b/projects/sv2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/uno.dsp b/projects/uno.dsp index 64c48f283..38a652432 100755 --- a/projects/uno.dsp +++ b/projects/uno.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\release" # PROP Target_Dir "" -WxLib32=link.exe -lib AgaLib=link.exe -lib +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 "c:..\cb\source" /I "c:..\include" /I "c:..\xvaga" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /D "DOS" /D "__LONGDOUBLE__" /D "CB6" /YX /FD /c # ADD BASE RSC /l 0x410 @@ -65,8 +65,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\debug" # PROP Target_Dir "" -WxLib32=link.exe -lib AgaLib=link.exe -lib +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 "..\cb\source" /I "..\include" /I "..\xvaga" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "XVT" /D "DOS" /D "__LONGDOUBLE__" /D "CB6" /FR /FD /c # SUBTRACT CPP /YX @@ -74,7 +74,7 @@ AgaLib=link.exe -lib # ADD RSC /l 0x410 BSC32=bscmake.exe # ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BSC32 /nologo /o"..\debug/Uno.bsc" LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib\UnoD.lib" diff --git a/projects/ve0.dsp b/projects/ve0.dsp index 25e837c1f..73c29f18b 100755 --- a/projects/ve0.dsp +++ b/projects/ve0.dsp @@ -249,7 +249,7 @@ SOURCE=..\ve\ve0100a.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0100a.uml InputName=ve0100a @@ -261,7 +261,7 @@ InputName=ve0100a !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0100a.uml InputName=ve0100a @@ -280,7 +280,7 @@ SOURCE=..\ve\ve0100b.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0100b.uml InputName=ve0100b @@ -292,7 +292,7 @@ InputName=ve0100b !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0100b.uml InputName=ve0100b @@ -311,7 +311,7 @@ SOURCE=..\ve\ve0100o.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0100o.uml InputName=ve0100o @@ -323,7 +323,7 @@ InputName=ve0100o !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0100o.uml InputName=ve0100o @@ -342,7 +342,7 @@ SOURCE=..\ve\ve0200a.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200a.uml InputName=ve0200a @@ -354,7 +354,7 @@ InputName=ve0200a !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200a.uml InputName=ve0200a @@ -373,7 +373,7 @@ SOURCE=..\ve\ve0200b.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200b.uml InputName=ve0200b @@ -385,7 +385,7 @@ InputName=ve0200b !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200b.uml InputName=ve0200b @@ -404,7 +404,7 @@ SOURCE=..\ve\ve0200c.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200c.uml InputName=ve0200c @@ -416,7 +416,7 @@ InputName=ve0200c !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200c.uml InputName=ve0200c @@ -435,7 +435,7 @@ SOURCE=..\ve\ve0200d.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200d.uml InputName=ve0200d @@ -447,7 +447,7 @@ InputName=ve0200d !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200d.uml InputName=ve0200d @@ -466,7 +466,7 @@ SOURCE=..\ve\ve0200e.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200e.uml InputName=ve0200e @@ -478,7 +478,7 @@ InputName=ve0200e !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200e.uml InputName=ve0200e @@ -497,7 +497,7 @@ SOURCE=..\ve\ve0200f.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200f.uml InputName=ve0200f @@ -509,7 +509,7 @@ InputName=ve0200f !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200f.uml InputName=ve0200f @@ -528,7 +528,7 @@ SOURCE=..\ve\ve0200g.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0200g.uml InputName=ve0200g @@ -540,7 +540,7 @@ InputName=ve0200g !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0200g.uml InputName=ve0200g @@ -559,7 +559,7 @@ SOURCE=..\ve\ve0500a.uml !IF "$(CFG)" == "ve0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve0500a.uml InputName=ve0500a @@ -571,7 +571,7 @@ InputName=ve0500a !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve0500a.uml InputName=ve0500a @@ -600,7 +600,7 @@ SOURCE=.\ve0.rc !ELSEIF "$(CFG)" == "ve0 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ve0.res" +# ADD RSC /l 0x410 /fo"..\Debug/ve0.res" !ENDIF diff --git a/projects/ve0.rc b/projects/ve0.rc index 67577a439..73b2f2002 100755 --- a/projects/ve0.rc +++ b/projects/ve0.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ve1.dsp b/projects/ve1.dsp index 06d5b7b0f..feb60e492 100755 --- a/projects/ve1.dsp +++ b/projects/ve1.dsp @@ -160,6 +160,10 @@ SOURCE=..\ve\ve1100.cpp # End Source File # Begin Source File +SOURCE=..\ve\ve1200.cpp +# End Source File +# Begin Source File + SOURCE=..\ve\velib01.cpp # End Source File # Begin Source File @@ -176,6 +180,10 @@ SOURCE=..\ve\velib03a.cpp # End Source File # Begin Source File +SOURCE=..\ve\velib04.cpp +# End Source File +# Begin Source File + SOURCE=..\ve\velib05.cpp # End Source File # End Group @@ -189,7 +197,7 @@ SOURCE=..\ve\ve1000b.uml !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve1000b.uml InputName=ve1000b @@ -201,7 +209,7 @@ InputName=ve1000b !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve1000b.uml InputName=ve1000b @@ -220,7 +228,7 @@ SOURCE=..\ve\ve1100a.uml !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve1100a.uml InputName=ve1100a @@ -232,7 +240,7 @@ InputName=ve1100a !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve1100a.uml InputName=ve1100a @@ -251,7 +259,7 @@ SOURCE=..\ve\ve1100b.uml !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve1100b.uml InputName=ve1100b @@ -263,7 +271,7 @@ InputName=ve1100b !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve1100b.uml InputName=ve1100b @@ -290,7 +298,7 @@ SOURCE=..\ve\listadoc.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\listadoc.frm InputName=listadoc @@ -302,7 +310,7 @@ InputName=listadoc !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\listadoc.frm InputName=listadoc @@ -321,7 +329,7 @@ SOURCE=..\ve\scontid.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\scontid.frm InputName=scontid @@ -333,7 +341,7 @@ InputName=scontid !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\scontid.frm InputName=scontid @@ -352,7 +360,7 @@ SOURCE=..\ve\scontii.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\scontii.frm InputName=scontii @@ -364,7 +372,7 @@ InputName=scontii !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\scontii.frm InputName=scontii @@ -383,7 +391,7 @@ SOURCE=..\ve\scontir.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\scontir.frm InputName=scontir @@ -395,7 +403,7 @@ InputName=scontir !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\scontir.frm InputName=scontir @@ -414,7 +422,7 @@ SOURCE=..\ve\veacc.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\veacc.frm InputName=veacc @@ -426,7 +434,7 @@ InputName=veacc !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\veacc.frm InputName=veacc @@ -445,7 +453,7 @@ SOURCE=..\ve\veaccbmp.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\veaccbmp.frm InputName=veaccbmp @@ -457,7 +465,7 @@ InputName=veaccbmp !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\veaccbmp.frm InputName=veaccbmp @@ -476,7 +484,7 @@ SOURCE=..\ve\vebol.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\vebol.frm InputName=vebol @@ -488,7 +496,7 @@ InputName=vebol !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\vebol.frm InputName=vebol @@ -507,7 +515,7 @@ SOURCE=..\ve\vebolbmp.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\vebolbmp.frm InputName=vebolbmp @@ -519,7 +527,7 @@ InputName=vebolbmp !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\vebolbmp.frm InputName=vebolbmp @@ -538,7 +546,7 @@ SOURCE=..\ve\vefat.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\vefat.frm InputName=vefat @@ -550,7 +558,7 @@ InputName=vefat !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\vefat.frm InputName=vefat @@ -569,7 +577,7 @@ SOURCE=..\ve\vefatbmp.frm !IF "$(CFG)" == "ve1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\vefatbmp.frm InputName=vefatbmp @@ -581,7 +589,7 @@ InputName=vefatbmp !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\vefatbmp.frm InputName=vefatbmp @@ -606,7 +614,7 @@ SOURCE=.\ve1.rc !ELSEIF "$(CFG)" == "ve1 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ve1.res" +# ADD RSC /l 0x410 /fo"..\Debug/ve1.res" !ENDIF diff --git a/projects/ve1.rc b/projects/ve1.rc index 67577a439..73b2f2002 100755 --- a/projects/ve1.rc +++ b/projects/ve1.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ve2.dsp b/projects/ve2.dsp index d245e5d6c..147be7f53 100755 --- a/projects/ve2.dsp +++ b/projects/ve2.dsp @@ -149,7 +149,7 @@ SOURCE=..\ve\ve2100.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2100.uml InputName=ve2100 @@ -161,7 +161,7 @@ InputName=ve2100 !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2100.uml InputName=ve2100 @@ -180,7 +180,7 @@ SOURCE=..\ve\ve2100d.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2100d.uml InputName=ve2100d @@ -192,7 +192,7 @@ InputName=ve2100d !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2100d.uml InputName=ve2100d @@ -211,7 +211,7 @@ SOURCE=..\ve\ve2100i.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2100i.uml InputName=ve2100i @@ -223,7 +223,7 @@ InputName=ve2100i !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2100i.uml InputName=ve2100i @@ -242,7 +242,7 @@ SOURCE=..\ve\ve2100r.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2100r.uml InputName=ve2100r @@ -254,7 +254,7 @@ InputName=ve2100r !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2100r.uml InputName=ve2100r @@ -273,7 +273,7 @@ SOURCE=..\ve\ve2200.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2200.uml InputName=ve2200 @@ -285,7 +285,7 @@ InputName=ve2200 !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2200.uml InputName=ve2200 @@ -304,7 +304,7 @@ SOURCE=..\ve\ve2200c.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2200c.uml InputName=ve2200c @@ -316,7 +316,7 @@ InputName=ve2200c !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2200c.uml InputName=ve2200c @@ -335,7 +335,7 @@ SOURCE=..\ve\ve2200x.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2200x.uml InputName=ve2200x @@ -347,7 +347,7 @@ InputName=ve2200x !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2200x.uml InputName=ve2200x @@ -366,7 +366,7 @@ SOURCE=..\ve\ve2300.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2300.uml InputName=ve2300 @@ -378,7 +378,7 @@ InputName=ve2300 !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2300.uml InputName=ve2300 @@ -397,7 +397,7 @@ SOURCE=..\ve\ve2300x.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2300x.uml InputName=ve2300x @@ -409,7 +409,7 @@ InputName=ve2300x !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2300x.uml InputName=ve2300x @@ -428,7 +428,7 @@ SOURCE=..\ve\ve2400.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400.uml InputName=ve2400 @@ -440,7 +440,7 @@ InputName=ve2400 !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400.uml InputName=ve2400 @@ -459,7 +459,7 @@ SOURCE=..\ve\ve2400a.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400a.uml InputName=ve2400a @@ -471,7 +471,7 @@ InputName=ve2400a !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400a.uml InputName=ve2400a @@ -490,7 +490,7 @@ SOURCE=..\ve\ve2400b.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400b.uml InputName=ve2400b @@ -502,7 +502,7 @@ InputName=ve2400b !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400b.uml InputName=ve2400b @@ -521,7 +521,7 @@ SOURCE=..\ve\ve2400c.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400c.uml InputName=ve2400c @@ -533,7 +533,7 @@ InputName=ve2400c !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400c.uml InputName=ve2400c @@ -552,7 +552,7 @@ SOURCE=..\ve\ve2400d.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400d.uml InputName=ve2400d @@ -564,7 +564,7 @@ InputName=ve2400d !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400d.uml InputName=ve2400d @@ -583,7 +583,7 @@ SOURCE=..\ve\ve2400e.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400e.uml InputName=ve2400e @@ -595,7 +595,7 @@ InputName=ve2400e !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400e.uml InputName=ve2400e @@ -614,7 +614,7 @@ SOURCE=..\ve\ve2400k.uml !IF "$(CFG)" == "ve2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve2400k.uml InputName=ve2400k @@ -626,7 +626,7 @@ InputName=ve2400k !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve2400k.uml InputName=ve2400k @@ -659,7 +659,7 @@ SOURCE=.\ve2.rc !ELSEIF "$(CFG)" == "ve2 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ve2.res" +# ADD RSC /l 0x410 /fo"..\Debug/ve2.res" !ENDIF diff --git a/projects/ve2.rc b/projects/ve2.rc index 67577a439..73b2f2002 100755 --- a/projects/ve2.rc +++ b/projects/ve2.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ve3.dsp b/projects/ve3.dsp index f30d6cb22..b81e3f9ea 100755 --- a/projects/ve3.dsp +++ b/projects/ve3.dsp @@ -125,7 +125,7 @@ SOURCE=..\ve\ve3100.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3100.uml InputName=ve3100 @@ -137,7 +137,7 @@ InputName=ve3100 !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3100.uml InputName=ve3100 @@ -156,7 +156,7 @@ SOURCE=..\ve\ve3100d.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3100d.uml InputName=ve3100d @@ -168,7 +168,7 @@ InputName=ve3100d !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3100d.uml InputName=ve3100d @@ -187,7 +187,7 @@ SOURCE=..\ve\ve3100i.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3100i.uml InputName=ve3100i @@ -199,7 +199,7 @@ InputName=ve3100i !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3100i.uml InputName=ve3100i @@ -218,7 +218,7 @@ SOURCE=..\ve\ve3100r.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3100r.uml InputName=ve3100r @@ -230,7 +230,7 @@ InputName=ve3100r !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3100r.uml InputName=ve3100r @@ -249,7 +249,7 @@ SOURCE=..\ve\ve3200.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3200.uml InputName=ve3200 @@ -261,7 +261,7 @@ InputName=ve3200 !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3200.uml InputName=ve3200 @@ -280,7 +280,7 @@ SOURCE=..\ve\ve3200x.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3200x.uml InputName=ve3200x @@ -292,7 +292,7 @@ InputName=ve3200x !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3200x.uml InputName=ve3200x @@ -311,7 +311,7 @@ SOURCE=..\ve\ve3300.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3300.uml InputName=ve3300 @@ -323,7 +323,7 @@ InputName=ve3300 !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3300.uml InputName=ve3300 @@ -342,7 +342,7 @@ SOURCE=..\ve\ve3300a.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3300a.uml InputName=ve3300a @@ -354,7 +354,7 @@ InputName=ve3300a !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3300a.uml InputName=ve3300a @@ -373,7 +373,7 @@ SOURCE=..\ve\ve3400.uml !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3400.uml InputName=ve3400 @@ -385,7 +385,7 @@ InputName=ve3400 !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3400.uml InputName=ve3400 @@ -412,7 +412,7 @@ SOURCE=..\ve\ve3300a.frm !IF "$(CFG)" == "ve3 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve3300a.frm InputName=ve3300a @@ -424,7 +424,7 @@ InputName=ve3300a !ELSEIF "$(CFG)" == "ve3 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve3300a.frm InputName=ve3300a diff --git a/projects/ve3.rc b/projects/ve3.rc index 67577a439..73b2f2002 100755 --- a/projects/ve3.rc +++ b/projects/ve3.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ve4.dsp b/projects/ve4.dsp index 5d9f6aa35..fd25ea66f 100755 --- a/projects/ve4.dsp +++ b/projects/ve4.dsp @@ -113,7 +113,7 @@ SOURCE=..\ve\ve4100.uml !IF "$(CFG)" == "ve4 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve4100.uml InputName=ve4100 @@ -125,7 +125,7 @@ InputName=ve4100 !ELSEIF "$(CFG)" == "ve4 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve4100.uml InputName=ve4100 @@ -158,7 +158,7 @@ SOURCE=.\ve4.rc !ELSEIF "$(CFG)" == "ve4 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ve4.res" +# ADD RSC /l 0x410 /fo"..\Debug/ve4.res" !ENDIF diff --git a/projects/ve4.rc b/projects/ve4.rc index 67577a439..73b2f2002 100755 --- a/projects/ve4.rc +++ b/projects/ve4.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ve5.dsp b/projects/ve5.dsp index db21dbc5d..3bc939188 100755 --- a/projects/ve5.dsp +++ b/projects/ve5.dsp @@ -197,7 +197,7 @@ SOURCE=..\ve\ve5100a.uml !IF "$(CFG)" == "ve5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve5100a.uml InputName=ve5100a @@ -209,7 +209,7 @@ InputName=ve5100a !ELSEIF "$(CFG)" == "ve5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve5100a.uml InputName=ve5100a @@ -228,7 +228,7 @@ SOURCE=..\ve\ve5200.uml !IF "$(CFG)" == "ve5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve5200.uml InputName=ve5200 @@ -240,7 +240,7 @@ InputName=ve5200 !ELSEIF "$(CFG)" == "ve5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve5200.uml InputName=ve5200 @@ -259,7 +259,7 @@ SOURCE=..\ve\ve5300a.uml !IF "$(CFG)" == "ve5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve5300a.uml InputName=ve5300a @@ -271,7 +271,7 @@ InputName=ve5300a !ELSEIF "$(CFG)" == "ve5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve5300a.uml InputName=ve5300a @@ -290,7 +290,7 @@ SOURCE=..\ve\ve5400.uml !IF "$(CFG)" == "ve5 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve5400.uml InputName=ve5400 @@ -302,7 +302,7 @@ InputName=ve5400 !ELSEIF "$(CFG)" == "ve5 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve5400.uml InputName=ve5400 @@ -331,7 +331,7 @@ SOURCE=.\ve5.rc !ELSEIF "$(CFG)" == "ve5 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ve5.res" +# ADD RSC /l 0x410 /fo"..\Debug/ve5.res" !ENDIF diff --git a/projects/ve5.rc b/projects/ve5.rc index 67577a439..73b2f2002 100755 --- a/projects/ve5.rc +++ b/projects/ve5.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/ve6.dsp b/projects/ve6.dsp index b7a0b73c8..4bc775494 100755 --- a/projects/ve6.dsp +++ b/projects/ve6.dsp @@ -237,7 +237,7 @@ SOURCE=..\ve\ve6100a.uml !IF "$(CFG)" == "ve6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve6100a.uml InputName=ve6100a @@ -249,7 +249,7 @@ InputName=ve6100a !ELSEIF "$(CFG)" == "ve6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve6100a.uml InputName=ve6100a @@ -268,7 +268,7 @@ SOURCE=..\ve\ve6200a.uml !IF "$(CFG)" == "ve6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve6200a.uml InputName=ve6200a @@ -280,7 +280,7 @@ InputName=ve6200a !ELSEIF "$(CFG)" == "ve6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve6200a.uml InputName=ve6200a @@ -299,7 +299,7 @@ SOURCE=..\ve\ve6300a.uml !IF "$(CFG)" == "ve6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve6300a.uml InputName=ve6300a @@ -311,7 +311,7 @@ InputName=ve6300a !ELSEIF "$(CFG)" == "ve6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve6300a.uml InputName=ve6300a @@ -330,7 +330,7 @@ SOURCE=..\ve\ve6400a.uml !IF "$(CFG)" == "ve6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve6400a.uml InputName=ve6400a @@ -342,7 +342,7 @@ InputName=ve6400a !ELSEIF "$(CFG)" == "ve6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve6400a.uml InputName=ve6400a @@ -361,7 +361,7 @@ SOURCE=..\ve\ve6500.uml !IF "$(CFG)" == "ve6 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exe +TargetDir=\U\Luca\r020200.aga\exe InputPath=..\ve\ve6500.uml InputName=ve6500 @@ -373,7 +373,7 @@ InputName=ve6500 !ELSEIF "$(CFG)" == "ve6 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200\exed +TargetDir=\U\Luca\r020200.aga\exed InputPath=..\ve\ve6500.uml InputName=ve6500 @@ -402,7 +402,7 @@ SOURCE=.\ve6.rc !ELSEIF "$(CFG)" == "ve6 - Win32 Debug" # ADD BASE RSC /l 0x410 -# ADD RSC /l 0x410 /fo"Debug/ve6.res" +# ADD RSC /l 0x410 /fo"..\Debug/ve6.res" !ENDIF diff --git a/projects/ve6.rc b/projects/ve6.rc index 67577a439..73b2f2002 100755 --- a/projects/ve6.rc +++ b/projects/ve6.rc @@ -1,4 +1,4 @@ "9012" ICON DISCARDABLE "../exe/res/CAMPO.ico" -rcinclude wx/msw/wx.rc +rcinclude ../../wx240/include/wx/msw/wx.rc diff --git a/projects/xi.dsp b/projects/xi.dsp index 1f0f145c6..31a2beebf 100755 --- a/projects/xi.dsp +++ b/projects/xi.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\release" # PROP Target_Dir "" -WxLib32=link.exe -lib AgaLib=link.exe -lib +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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DWSWIN" /D "XI_R4_API" /YX /FD /c # ADD BASE RSC /l 0x410 @@ -65,8 +65,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\lib" # PROP Intermediate_Dir "..\debug" # PROP Target_Dir "" -WxLib32=link.exe -lib AgaLib=link.exe -lib +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 "..\xi" /I "..\xvaga" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DWSWIN" /D "XI_R4_API" /FR /FD /c # SUBTRACT CPP /YX @@ -74,7 +74,7 @@ AgaLib=link.exe -lib # ADD RSC /l 0x410 BSC32=bscmake.exe # ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BSC32 /nologo /o"..\debug/Xi.bsc" LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib\XiD.lib" diff --git a/projects/xvaga.dsp b/projects/xvaga.dsp index 77a8e66df..6ea355e0a 100755 --- a/projects/xvaga.dsp +++ b/projects/xvaga.dsp @@ -44,7 +44,6 @@ AgaLib=link.exe -lib WxLib32=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 /I "..\..\wx240\lib\mswdll" /I "..\..\wx240\include" /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D WXUSINGDLL=1 /YX /FD /c -# SUBTRACT CPP /O # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe @@ -75,7 +74,7 @@ WxLib32=link.exe -lib # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BSC32 /nologo /o"..\debug/Xvaga.bsc" LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\Lib\xvagaD.lib"