From 96f16259f4affadfab3cb053f4a69cbffe998af1 Mon Sep 17 00:00:00 2001 From: cornet Date: Wed, 22 Apr 2009 07:23:14 +0000 Subject: resolve cross dependency between auxiliaryFunctions & elementaryFunctions dll (build with vs express & vs pro) --- scilab2c.sln | 4 ++++ scilab2c_f2c.sln | 26 +++++++++++++++------- .../auxiliaryFunctions_Import.def | 8 +++++++ src/elementaryFunctions/elementaryFunctions.vcproj | 4 ++++ src/operations/auxiliaryFunctions_Import.def | 6 +++++ src/operations/operations.vcproj | 4 ++++ 6 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 src/elementaryFunctions/auxiliaryFunctions_Import.def create mode 100644 src/operations/auxiliaryFunctions_Import.def diff --git a/scilab2c.sln b/scilab2c.sln index 71068dfe..e4bd770d 100644 --- a/scilab2c.sln +++ b/scilab2c.sln @@ -24,6 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementaryFunctions", "src\ ProjectSection(ProjectDependencies) = postProject {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} + {9B622A66-546A-4B33-B947-0A189D259D37} = {9B622A66-546A-4B33-B947-0A189D259D37} {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} EndProjectSection EndProject @@ -55,8 +56,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "auxiliaryFunctions", "src\a EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matrixOperations", "src\matrixOperations\matrixOperations.vcproj", "{FD335544-52BF-4736-A34E-77F591D158D5}" ProjectSection(ProjectDependencies) = postProject + {72B46833-B150-432D-B231-3E0ECD91E190} = {72B46833-B150-432D-B231-3E0ECD91E190} {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} + {9B622A66-546A-4B33-B947-0A189D259D37} = {9B622A66-546A-4B33-B947-0A189D259D37} {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} + {AF4A8AF2-CC9F-4991-BE6E-8AAF9CB5BFC9} = {AF4A8AF2-CC9F-4991-BE6E-8AAF9CB5BFC9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "src\operations\operations.vcproj", "{9B622A66-546A-4B33-B947-0A189D259D37}" diff --git a/scilab2c_f2c.sln b/scilab2c_f2c.sln index 61f6f643..0fc5c9f1 100644 --- a/scilab2c_f2c.sln +++ b/scilab2c_f2c.sln @@ -22,13 +22,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_floatComplex", "src\ty EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementaryFunctions", "src\elementaryFunctions\elementaryFunctions.vcproj", "{72B46833-B150-432D-B231-3E0ECD91E190}" ProjectSection(ProjectDependencies) = postProject + {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} + {9B622A66-546A-4B33-B947-0A189D259D37} = {9B622A66-546A-4B33-B947-0A189D259D37} {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cplxacos", "src\elementaryFunctions\acos\test_cplxacos\test_cplxacos.vcproj", "{20AFE4D5-CE52-4CCE-ADAB-87442079BC0B}" ProjectSection(ProjectDependencies) = postProject {72B46833-B150-432D-B231-3E0ECD91E190} = {72B46833-B150-432D-B231-3E0ECD91E190} + {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_realsacos", "src\elementaryFunctions\acos\testrealsacos\testrealsacos.vcproj", "{0556427D-6D88-4A12-9EB3-7F551D6F1FA4}" @@ -36,28 +39,35 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_realsacos", "src\eleme {72B46833-B150-432D-B231-3E0ECD91E190} = {72B46833-B150-432D-B231-3E0ECD91E190} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CC8D7D27-870A-4E38-B4E1-9562859DEC6D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4BB7C9F2-969F-4C5C-97F1-89350DCC09B6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_doubleacosh", "src\elementaryFunctions\acosh\test_doubleacosh\test_doubleacosh.vcproj", "{5805527C-6A77-40A9-8EF6-414B0269B50E}" ProjectSection(ProjectDependencies) = postProject {72B46833-B150-432D-B231-3E0ECD91E190} = {72B46833-B150-432D-B231-3E0ECD91E190} + {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "auxiliaryFunctions", "src\auxiliaryFunctions\auxiliaryFunctions.vcproj", "{AF4A8AF2-CC9F-4991-BE6E-8AAF9CB5BFC9}" ProjectSection(ProjectDependencies) = postProject {72B46833-B150-432D-B231-3E0ECD91E190} = {72B46833-B150-432D-B231-3E0ECD91E190} {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} + {9B622A66-546A-4B33-B947-0A189D259D37} = {9B622A66-546A-4B33-B947-0A189D259D37} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matrixOperations", "src\matrixOperations\matrixOperations.vcproj", "{FD335544-52BF-4736-A34E-77F591D158D5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "src\operations\operations.vcproj", "{9B622A66-546A-4B33-B947-0A189D259D37}" ProjectSection(ProjectDependencies) = postProject {72B46833-B150-432D-B231-3E0ECD91E190} = {72B46833-B150-432D-B231-3E0ECD91E190} {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} + {9B622A66-546A-4B33-B947-0A189D259D37} = {9B622A66-546A-4B33-B947-0A189D259D37} + {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} {AF4A8AF2-CC9F-4991-BE6E-8AAF9CB5BFC9} = {AF4A8AF2-CC9F-4991-BE6E-8AAF9CB5BFC9} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "src\operations\operations.vcproj", "{9B622A66-546A-4B33-B947-0A189D259D37}" + ProjectSection(ProjectDependencies) = postProject + {9B1BD750-1FEF-4D6B-9422-782D16181CEE} = {9B1BD750-1FEF-4D6B-9422-782D16181CEE} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -147,10 +157,10 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A6EBF2F9-C100-453F-A0D1-1649DCF557EC} = {CC8D7D27-870A-4E38-B4E1-9562859DEC6D} - {20AFE4D5-CE52-4CCE-ADAB-87442079BC0B} = {CC8D7D27-870A-4E38-B4E1-9562859DEC6D} - {0556427D-6D88-4A12-9EB3-7F551D6F1FA4} = {CC8D7D27-870A-4E38-B4E1-9562859DEC6D} - {DBB1B4E8-E9D0-44E5-8AA6-4ECF1AAA1D0F} = {CC8D7D27-870A-4E38-B4E1-9562859DEC6D} - {5805527C-6A77-40A9-8EF6-414B0269B50E} = {CC8D7D27-870A-4E38-B4E1-9562859DEC6D} + {A6EBF2F9-C100-453F-A0D1-1649DCF557EC} = {4BB7C9F2-969F-4C5C-97F1-89350DCC09B6} + {20AFE4D5-CE52-4CCE-ADAB-87442079BC0B} = {4BB7C9F2-969F-4C5C-97F1-89350DCC09B6} + {0556427D-6D88-4A12-9EB3-7F551D6F1FA4} = {4BB7C9F2-969F-4C5C-97F1-89350DCC09B6} + {DBB1B4E8-E9D0-44E5-8AA6-4ECF1AAA1D0F} = {4BB7C9F2-969F-4C5C-97F1-89350DCC09B6} + {5805527C-6A77-40A9-8EF6-414B0269B50E} = {4BB7C9F2-969F-4C5C-97F1-89350DCC09B6} EndGlobalSection EndGlobal diff --git a/src/elementaryFunctions/auxiliaryFunctions_Import.def b/src/elementaryFunctions/auxiliaryFunctions_Import.def new file mode 100644 index 00000000..ee7e26e6 --- /dev/null +++ b/src/elementaryFunctions/auxiliaryFunctions_Import.def @@ -0,0 +1,8 @@ +LIBRARY auxiliaryFunctions.dll + + +EXPORTS +sabss +dabss +spythags +dpythags \ No newline at end of file diff --git a/src/elementaryFunctions/elementaryFunctions.vcproj b/src/elementaryFunctions/elementaryFunctions.vcproj index d28a0948..865fd479 100644 --- a/src/elementaryFunctions/elementaryFunctions.vcproj +++ b/src/elementaryFunctions/elementaryFunctions.vcproj @@ -25,6 +25,7 @@ >