diff --git a/build/AgaLib.vcxproj b/build/AgaLib.vcxproj index 710e2093a..b126a467b 100644 --- a/build/AgaLib.vcxproj +++ b/build/AgaLib.vcxproj @@ -848,6 +848,10 @@ {50f46f99-bd70-4bb3-ba95-7ae2baf35234} + + + + diff --git a/build/AgaLib.vcxproj.filters b/build/AgaLib.vcxproj.filters index 95432bf51..d358e86ae 100644 --- a/build/AgaLib.vcxproj.filters +++ b/build/AgaLib.vcxproj.filters @@ -768,4 +768,8 @@ Libraries + + + + \ No newline at end of file diff --git a/build/Ba3.vcxproj b/build/Ba3.vcxproj index 94506d85f..4a738f76b 100644 --- a/build/Ba3.vcxproj +++ b/build/Ba3.vcxproj @@ -74,7 +74,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -235,6 +235,7 @@ + diff --git a/build/Ba3.vcxproj.filters b/build/Ba3.vcxproj.filters index b12842991..9f4b53ce4 100644 --- a/build/Ba3.vcxproj.filters +++ b/build/Ba3.vcxproj.filters @@ -92,6 +92,9 @@ Masks + + Masks + diff --git a/build/Bacnv.vcxproj b/build/Bacnv.vcxproj index 06998c64b..0c9058279 100644 --- a/build/Bacnv.vcxproj +++ b/build/Bacnv.vcxproj @@ -43,7 +43,7 @@ false ..\exe\ ..\obj\ - false + true false false false diff --git a/build/Bainst.vcxproj b/build/Bainst.vcxproj index cf45bf3ce..7671dc61f 100644 --- a/build/Bainst.vcxproj +++ b/build/Bainst.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\ - false + true ..\exe\ ..\obj\ false diff --git a/build/Cg0.vcxproj b/build/Cg0.vcxproj index c9d241c54..047412f71 100644 --- a/build/Cg0.vcxproj +++ b/build/Cg0.vcxproj @@ -290,7 +290,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg1.vcxproj b/build/Cg1.vcxproj index 0bd4126a2..1e1083353 100644 --- a/build/Cg1.vcxproj +++ b/build/Cg1.vcxproj @@ -319,7 +319,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg2.vcxproj b/build/Cg2.vcxproj index d08c53f3f..817b6fbcc 100644 --- a/build/Cg2.vcxproj +++ b/build/Cg2.vcxproj @@ -294,7 +294,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg3.vcxproj b/build/Cg3.vcxproj index b33ee21c2..374553bdf 100644 --- a/build/Cg3.vcxproj +++ b/build/Cg3.vcxproj @@ -309,7 +309,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg4.vcxproj b/build/Cg4.vcxproj index 5a8c3a3c7..11f03a34a 100644 --- a/build/Cg4.vcxproj +++ b/build/Cg4.vcxproj @@ -340,7 +340,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg5.vcxproj b/build/Cg5.vcxproj index b9af1e117..f35c525da 100644 --- a/build/Cg5.vcxproj +++ b/build/Cg5.vcxproj @@ -316,7 +316,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg6.vcxproj b/build/Cg6.vcxproj index a76fba2fe..ac952102c 100644 --- a/build/Cg6.vcxproj +++ b/build/Cg6.vcxproj @@ -331,7 +331,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + diff --git a/build/Cg7.vcxproj b/build/Cg7.vcxproj index dc0d06675..770927df5 100644 --- a/build/Cg7.vcxproj +++ b/build/Cg7.vcxproj @@ -196,7 +196,9 @@ - + + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) + @@ -228,8 +230,12 @@ - - + + Designer + + + Designer + Designer diff --git a/build/Cg7.vcxproj.user b/build/Cg7.vcxproj.user new file mode 100644 index 000000000..5c0ad9bfc --- /dev/null +++ b/build/Cg7.vcxproj.user @@ -0,0 +1,8 @@ + + + + $(OutDir) + WindowsLocalDebugger + -6 -uADMIN + + \ No newline at end of file diff --git a/build/agalib.sln b/build/agalib.sln index a8eaa3620..8673012e5 100644 --- a/build/agalib.sln +++ b/build/agalib.sln @@ -24,6 +24,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvapp", "xvapp.vcxproj", "{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflibwrap", "pdflibwrap.vcxproj", "{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}" + ProjectSection(ProjectDependencies) = postProject + {3A5B0119-6DAD-4407-9EE1-3B739B0581E8} = {3A5B0119-6DAD-4407-9EE1-3B739B0581E8} + {4A2FC619-2461-4F58-8F1D-92FA153E39A2} = {4A2FC619-2461-4F58-8F1D-92FA153E39A2} + {A294C667-27A9-4125-82AF-5093447505EC} = {A294C667-27A9-4125-82AF-5093447505EC} + {99683594-420F-4DD9-BB41-7DC48278B931} = {99683594-420F-4DD9-BB41-7DC48278B931} + {37C3DDAE-3A63-4C1C-A419-242141B262ED} = {37C3DDAE-3A63-4C1C-A419-242141B262ED} + {153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2} = {153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2} + {8B0477F1-5D74-46C3-97B6-8879E2460A71} = {8B0477F1-5D74-46C3-97B6-8879E2460A71} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvtdb", "xvtdb.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}" EndProject diff --git a/build/bs0.vcxproj b/build/bs0.vcxproj index 7b5a566b1..3a1035eb0 100644 --- a/build/bs0.vcxproj +++ b/build/bs0.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\ - false + true ..\exe\ ..\obj\ false @@ -182,6 +182,8 @@ + + diff --git a/build/bs0.vcxproj.filters b/build/bs0.vcxproj.filters index 23f6642f9..34d047151 100644 --- a/build/bs0.vcxproj.filters +++ b/build/bs0.vcxproj.filters @@ -68,6 +68,12 @@ Headers + + Headers + + + Headers + diff --git a/build/ca0.vcxproj b/build/ca0.vcxproj index e14ac868e..455b0220c 100644 --- a/build/ca0.vcxproj +++ b/build/ca0.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\ - false + true ..\exe\ ..\obj\ false diff --git a/build/ca1.vcxproj b/build/ca1.vcxproj index 6e668e8dd..ce9fce36d 100644 --- a/build/ca1.vcxproj +++ b/build/ca1.vcxproj @@ -43,7 +43,7 @@ false ..\exe\ ..\obj\ - false + true false false false diff --git a/build/ca2.vcxproj b/build/ca2.vcxproj index 709826337..153eec998 100644 --- a/build/ca2.vcxproj +++ b/build/ca2.vcxproj @@ -42,7 +42,7 @@ ..\obj\ false ..\exe\ - false + true false false false @@ -235,6 +235,9 @@ true false + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/ca3.vcxproj b/build/ca3.vcxproj index 7c3ead403..3de06cdc0 100644 --- a/build/ca3.vcxproj +++ b/build/ca3.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\ - false + true ..\exe\ ..\obj\ false diff --git a/build/ce0.vcxproj.user b/build/ce0.vcxproj.user deleted file mode 100644 index 646a79508..000000000 --- a/build/ce0.vcxproj.user +++ /dev/null @@ -1,17 +0,0 @@ - - - - 0 CCE -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - - 0 -uADMIN - - - $(TargettDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/build/ce1.vcxproj.user b/build/ce1.vcxproj.user deleted file mode 100644 index 8758611ed..000000000 --- a/build/ce1.vcxproj.user +++ /dev/null @@ -1,17 +0,0 @@ - - - - -0-uADMIN - - - $(TargettDir) - WindowsLocalDebugger - - - -0-uADMIN - - - $(TargettDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/build/ce2.vcxproj.user b/build/ce2.vcxproj.user deleted file mode 100644 index 0e66df788..000000000 --- a/build/ce2.vcxproj.user +++ /dev/null @@ -1,17 +0,0 @@ - - - - -o -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - - -o -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/build/ce3.vcxproj.user b/build/ce3.vcxproj.user deleted file mode 100644 index 1d658a406..000000000 --- a/build/ce3.vcxproj.user +++ /dev/null @@ -1,17 +0,0 @@ - - - - -8 -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - - -0 -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/build/ce4.vcxproj.user b/build/ce4.vcxproj.user deleted file mode 100644 index 16a1a550c..000000000 --- a/build/ce4.vcxproj.user +++ /dev/null @@ -1,17 +0,0 @@ - - - - -4 -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - - -0 -uADMIN - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/build/ci1.vcxproj b/build/ci1.vcxproj index af20bf550..0a27d4b1c 100644 --- a/build/ci1.vcxproj +++ b/build/ci1.vcxproj @@ -78,7 +78,7 @@ %(IgnoreSpecificDefaultLibraries) - $(IntDir) + true Windows false diff --git a/build/ci2.vcxproj b/build/ci2.vcxproj index c810d2661..fc16b95eb 100644 --- a/build/ci2.vcxproj +++ b/build/ci2.vcxproj @@ -84,7 +84,7 @@ %(AdditionalDependencies) %(IgnoreSpecificDefaultLibraries) - $(IntDir) + true MachineX86 @@ -135,8 +135,7 @@ $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) - $(IntDir) - Windows + $(IntDir) Windows MachineX86 @@ -204,24 +203,6 @@ true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - - diff --git a/build/ci2.vcxproj.filters b/build/ci2.vcxproj.filters index 4a2f46882..251217a22 100644 --- a/build/ci2.vcxproj.filters +++ b/build/ci2.vcxproj.filters @@ -13,9 +13,6 @@ {ac5b9d41-64cf-4006-8a03-227305b37e11} h - - {d1c1db31-7022-419a-aeec-8b7c182dc1c9} - @@ -81,22 +78,6 @@ - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - - - Libraries - + \ No newline at end of file diff --git a/build/ini32.bat b/build/ini32.bat index 9e1935997..5f78d1b17 100644 --- a/build/ini32.bat +++ b/build/ini32.bat @@ -4,20 +4,7 @@ echo Generating %1 ini file set oldinc=%include set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 -type ..\src\include\uml.h >%TMP%\%~n1.tmp -type %1 >>%TMP%\%~n1.tmp - -cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\~n1.in0 -fastrip %TMP%\~n1.in0 %TMP%\~n1.ini -copy %TMP%\~n1.ini %2 - -set include=%oldinc -set oldinc= - -del %TMP%\~n1.ini -del %TMP%\~n1.in0 -del %TMP%\~n1.tmp - +srcini %1 %2 cd %~p2 echo Generating %2 msk file -ve0 -3 %2 -f /uADMIN +ve0 -3 %2 -f /uADMIN \ No newline at end of file diff --git a/build/ini32r.bat b/build/ini32r.bat index 9e1935997..5319c3e54 100644 --- a/build/ini32r.bat +++ b/build/ini32r.bat @@ -4,20 +4,7 @@ echo Generating %1 ini file set oldinc=%include set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 -type ..\src\include\uml.h >%TMP%\%~n1.tmp -type %1 >>%TMP%\%~n1.tmp - -cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\~n1.in0 -fastrip %TMP%\~n1.in0 %TMP%\~n1.ini -copy %TMP%\~n1.ini %2 - -set include=%oldinc -set oldinc= - -del %TMP%\~n1.ini -del %TMP%\~n1.in0 -del %TMP%\~n1.tmp - +srcini %1 %2 cd %~p2 echo Generating %2 msk file ve0 -3 %2 -f /uADMIN diff --git a/build/mr1.vcxproj b/build/mr1.vcxproj index 631cc9d05..c5cb9f272 100644 --- a/build/mr1.vcxproj +++ b/build/mr1.vcxproj @@ -118,11 +118,11 @@ _DEBUG;__LONGDOUBLE__%(PreprocessorDefinitions) 0x0410 - ..\..\wx28X\include;%(AdditionalIncludeDirectories) + ..\wx28X\include;%(AdditionalIncludeDirectories) version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) - ../exed/mr1.exe + $(OutDir)$(TargetName)$(TargetExt) true libc.lib;%(IgnoreSpecificDefaultLibraries) true diff --git a/build/mr2.vcxproj b/build/mr2.vcxproj index 98e5a7400..1d506833a 100644 --- a/build/mr2.vcxproj +++ b/build/mr2.vcxproj @@ -87,6 +87,7 @@ MachineX86 12.0 + false true diff --git a/build/pa0.vcxproj b/build/pa0.vcxproj index 631bffe66..7b8980ccf 100644 --- a/build/pa0.vcxproj +++ b/build/pa0.vcxproj @@ -38,11 +38,11 @@ <_ProjectFileVersion>10.0.30319.1 - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\exe\ + ..\obj\ + true ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false diff --git a/build/profiles.vcxproj b/build/profiles.vcxproj index 5a25f7268..0338be5de 100644 --- a/build/profiles.vcxproj +++ b/build/profiles.vcxproj @@ -146,7 +146,7 @@ - Document + Document diff --git a/build/ri0.vcxproj b/build/ri0.vcxproj index efed9d352..a748f579d 100644 --- a/build/ri0.vcxproj +++ b/build/ri0.vcxproj @@ -38,14 +38,16 @@ <_ProjectFileVersion>10.0.30319.1 - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\exe\ + ..\obj\ + true ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false + $(ProjectName) + $(ProjectName) diff --git a/build/ri1.vcxproj b/build/ri1.vcxproj index ba72125c7..92ee03dcc 100644 --- a/build/ri1.vcxproj +++ b/build/ri1.vcxproj @@ -38,11 +38,11 @@ <_ProjectFileVersion>10.0.30319.1 - ..\exed\ - $(Configuration)\$(ProjectName)\ - false + ..\exe\ + ..\obj\ + true ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false @@ -79,7 +79,7 @@ wsock32.lib;%(AdditionalDependencies) - ../exed/ri1.exe + $(OutDir)$(TargetName)$(TargetExt) true %(IgnoreSpecificDefaultLibraries) true @@ -133,6 +133,7 @@ MachineX86 12.0 false + $(OutDir)$(TargetName)$(TargetExt) true diff --git a/build/tf0.vcxproj b/build/tf0.vcxproj index 2530925d5..f074a85af 100644 --- a/build/tf0.vcxproj +++ b/build/tf0.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\ - false + true ..\exe\ ..\obj\ false @@ -180,6 +180,8 @@ + + diff --git a/build/tf0.vcxproj.filters b/build/tf0.vcxproj.filters index 13afe7480..d8f84988b 100644 --- a/build/tf0.vcxproj.filters +++ b/build/tf0.vcxproj.filters @@ -80,6 +80,12 @@ Sources + + Sources + + + Sources + diff --git a/build/ve0.vcxproj b/build/ve0.vcxproj index 548abc02a..72ad3d4ba 100644 --- a/build/ve0.vcxproj +++ b/build/ve0.vcxproj @@ -75,7 +75,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve1.vcxproj b/build/ve1.vcxproj index 3245fbd1e..4a28850f2 100644 --- a/build/ve1.vcxproj +++ b/build/ve1.vcxproj @@ -119,7 +119,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve2.vcxproj b/build/ve2.vcxproj index 619076e37..1ee71f77c 100644 --- a/build/ve2.vcxproj +++ b/build/ve2.vcxproj @@ -75,7 +75,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve3.vcxproj b/build/ve3.vcxproj index b86af24ff..29ac12272 100644 --- a/build/ve3.vcxproj +++ b/build/ve3.vcxproj @@ -75,7 +75,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve4.vcxproj b/build/ve4.vcxproj index 45bf6ad62..42491a85e 100644 --- a/build/ve4.vcxproj +++ b/build/ve4.vcxproj @@ -75,7 +75,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve5.vcxproj b/build/ve5.vcxproj index 065eea214..50f477b22 100644 --- a/build/ve5.vcxproj +++ b/build/ve5.vcxproj @@ -120,7 +120,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve6.vcxproj b/build/ve6.vcxproj index b5fd60785..85c48e7fb 100644 --- a/build/ve6.vcxproj +++ b/build/ve6.vcxproj @@ -75,7 +75,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/ve8.vcxproj b/build/ve8.vcxproj index 3cd5ced0e..14fc1d915 100644 --- a/build/ve8.vcxproj +++ b/build/ve8.vcxproj @@ -75,7 +75,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) diff --git a/build/xvaga.vcxproj.filters b/build/xvaga.vcxproj.filters index ff61c6d8f..9dac814da 100644 --- a/build/xvaga.vcxproj.filters +++ b/build/xvaga.vcxproj.filters @@ -202,5 +202,8 @@ Libraries + + Libraries + \ No newline at end of file