summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2012-07-24 16:30:15 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2012-07-24 16:30:15 +0200
commit66343cd1cafc6255ef42efc742ea25ec03d66eab (patch)
treec58c4b36e9b8edd18023f48b810830c611d3339c /scilab/Scilab_f2c.sln
parentdcf7994f92b505a82deb335213c8c81602af1afe (diff)
downloadscilab-66343cd1cafc6255ef42efc742ea25ec03d66eab.zip
scilab-66343cd1cafc6255ef42efc742ea25ec03d66eab.tar.gz
Fix Windows compilation after merge.
Change-Id: Ic1b983bf7f74993da38e6bdf574d4034ce5e3fbe
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln52
1 files changed, 11 insertions, 41 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 9aef6ab..7e465f6 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -51,39 +51,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\
51 {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} = {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} 51 {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} = {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}
52 {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} 52 {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
53 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621} 53 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
54 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
55 {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
56 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
57 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
58 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
59 {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
60 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
61 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
62 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
63 {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8} 54 {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
64 {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA} 55 {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
65 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} 56 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
66 {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315} 57 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
58 {273B1F5C-C137-46D1-B516-FFE5764FABE5} = {273B1F5C-C137-46D1-B516-FFE5764FABE5}
67 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} 59 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
68 {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD} 60 {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
69 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310} 61 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
70 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9} 62 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
63 {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
64 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
71 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} 65 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
72 {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA} 66 {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
73 {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} = {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} 67 {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} = {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604}
74 {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA} 68 {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
75 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E} 69 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
70 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
71 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
76 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} 72 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
77 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503} 73 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
78 {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163} 74 {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
79 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC} = {445D3B85-C9B1-498B-9C88-0A3C2390B1CC} 75 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC} = {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}
76 {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
80 {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E} = {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E} 77 {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E} = {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E}
81 {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8} 78 {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8}
82 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} 79 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
83 {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} 80 {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}
84 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238} 81 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
82 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
83 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
85 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393} 84 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
86 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3} 85 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
86 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
87 {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} = {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} 87 {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} = {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76}
88 {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E} 88 {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
89 {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} 89 {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
@@ -124,12 +124,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_f", "modules\intege
124 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 124 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
125 EndProjectSection 125 EndProjectSection
126EndProject 126EndProject
127Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersci", "modules\intersci\src\lib\intersci.vcxproj", "{DFA0D75B-F7EF-4D02-B33F-486829405315}"
128EndProject
129Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersciexe", "modules\intersci\src\exe\intersciexe\intersciexe.vcxproj", "{73AA7612-4297-4339-B521-8C2870E7BEC1}"
130EndProject
131Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intersci-n", "modules\intersci\src\exe\interscin\interscin.vcxproj", "{53AAB5BC-2C08-4BBA-9793-C36140A404F8}"
132EndProject
133Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "modules\gui\src\c\gui.vcxproj", "{45CA5B12-7601-4968-AE16-16069FD1A152}" 127Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "modules\gui\src\c\gui.vcxproj", "{45CA5B12-7601-4968-AE16-16069FD1A152}"
134 ProjectSection(ProjectDependencies) = postProject 128 ProjectSection(ProjectDependencies) = postProject
135 {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D} 129 {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
@@ -412,8 +406,8 @@ EndProject
412Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks_f", "modules\scicos_blocks\src\fortran\scicos_blocks_f2c.vcxproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}" 406Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks_f", "modules\scicos_blocks\src\fortran\scicos_blocks_f2c.vcxproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}"
413 ProjectSection(ProjectDependencies) = postProject 407 ProjectSection(ProjectDependencies) = postProject
414 {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} 408 {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
415 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
416 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 409 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
410 {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
417 EndProjectSection 411 EndProjectSection
418EndProject 412EndProject
419Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noumfpack", "modules\umfpack\src\noumfpack\noumfpack.vcxproj", "{6B557C09-7D85-42A4-A2B3-E952E00ACD28}" 413Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noumfpack", "modules\umfpack\src\noumfpack\noumfpack.vcxproj", "{6B557C09-7D85-42A4-A2B3-E952E00ACD28}"
@@ -731,30 +725,6 @@ Global
731 {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}.Release|Win32.Build.0 = Release|Win32 725 {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}.Release|Win32.Build.0 = Release|Win32
732 {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}.Release|x64.ActiveCfg = Release|x64 726 {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}.Release|x64.ActiveCfg = Release|x64
733 {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}.Release|x64.Build.0 = Release|x64 727 {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}.Release|x64.Build.0 = Release|x64
734 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Debug|Win32.ActiveCfg = Debug|Win32
735 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Debug|Win32.Build.0 = Debug|Win32
736 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Debug|x64.ActiveCfg = Debug|x64
737 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Debug|x64.Build.0 = Debug|x64
738 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Release|Win32.ActiveCfg = Release|Win32
739 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Release|Win32.Build.0 = Release|Win32
740 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Release|x64.ActiveCfg = Release|x64
741 {DFA0D75B-F7EF-4D02-B33F-486829405315}.Release|x64.Build.0 = Release|x64
742 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Debug|Win32.ActiveCfg = Debug|Win32
743 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Debug|Win32.Build.0 = Debug|Win32
744 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Debug|x64.ActiveCfg = Debug|x64
745 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Debug|x64.Build.0 = Debug|x64
746 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Release|Win32.ActiveCfg = Release|Win32
747 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Release|Win32.Build.0 = Release|Win32
748 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Release|x64.ActiveCfg = Release|x64
749 {73AA7612-4297-4339-B521-8C2870E7BEC1}.Release|x64.Build.0 = Release|x64
750 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Debug|Win32.ActiveCfg = Debug|Win32
751 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Debug|Win32.Build.0 = Debug|Win32
752 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Debug|x64.ActiveCfg = Debug|x64
753 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Debug|x64.Build.0 = Debug|x64
754 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Release|Win32.ActiveCfg = Release|Win32
755 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Release|Win32.Build.0 = Release|Win32
756 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Release|x64.ActiveCfg = Release|x64
757 {53AAB5BC-2C08-4BBA-9793-C36140A404F8}.Release|x64.Build.0 = Release|x64
758 {45CA5B12-7601-4968-AE16-16069FD1A152}.Debug|Win32.ActiveCfg = Debug|Win32 728 {45CA5B12-7601-4968-AE16-16069FD1A152}.Debug|Win32.ActiveCfg = Debug|Win32
759 {45CA5B12-7601-4968-AE16-16069FD1A152}.Debug|Win32.Build.0 = Debug|Win32 729 {45CA5B12-7601-4968-AE16-16069FD1A152}.Debug|Win32.Build.0 = Debug|Win32
760 {45CA5B12-7601-4968-AE16-16069FD1A152}.Debug|x64.ActiveCfg = Debug|x64 730 {45CA5B12-7601-4968-AE16-16069FD1A152}.Debug|x64.ActiveCfg = Debug|x64