diff --git a/Examples/perl5/import/README b/Examples/perl5/import/README index 332ea4f7a..08b4c5b1b 100644 --- a/Examples/perl5/import/README +++ b/Examples/perl5/import/README @@ -34,8 +34,10 @@ Unix: Windows: -------- -- Use the Visual C++ 6 workspace file (example.dsw). Build each project - to create the 5 DLLs. The Batch build option in the Build menu is the - easiest way to do this. Only use the Release builds not the Debug builds. +- Use the Visual C++ 6 workspace file (example.dsw). Build the runtime + project DLL first followed by the other 4 DLLs as they all have a + dependency on the runtime DLL. The Batch build option in the Build menu + is usually the easiest way to do this. Only use the Release builds not + the Debug builds. - Run the test as described above diff --git a/Examples/perl5/import/bar.dsp b/Examples/perl5/import/bar.dsp index 78d52170b..a5e3533f1 100644 --- a/Examples/perl5/import/bar.dsp +++ b/Examples/perl5/import/bar.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /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 "$(PERL5_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "bar - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /machine:I386 /out:"bar.dll" +# 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 "$(PERL5_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"bar.dll" !ENDIF diff --git a/Examples/perl5/import/base.dsp b/Examples/perl5/import/base.dsp index 29ebd2e6b..e59380fe7 100644 --- a/Examples/perl5/import/base.dsp +++ b/Examples/perl5/import/base.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /debug /machine:I386 /out:"baseclass.dll" /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 "$(PERL5_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"baseclass.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "base - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /machine:I386 /out:"baseclass.dll" +# 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 "$(PERL5_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"baseclass.dll" !ENDIF diff --git a/Examples/perl5/import/example.dsw b/Examples/perl5/import/example.dsw index 496c21544..0c2fe7504 100644 --- a/Examples/perl5/import/example.dsw +++ b/Examples/perl5/import/example.dsw @@ -11,6 +11,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -23,6 +26,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -33,6 +39,21 @@ Package=<5> {{{ }}} +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency +}}} + +############################################################################### + +Project: "runtime"=.\runtime.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + Package=<4> {{{ }}} @@ -47,6 +68,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### diff --git a/Examples/perl5/import/foo.dsp b/Examples/perl5/import/foo.dsp index 42ea10cfd..98c0e8f23 100644 --- a/Examples/perl5/import/foo.dsp +++ b/Examples/perl5/import/foo.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /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 "$(PERL5_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "foo - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /machine:I386 /out:"foo.dll" +# 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 "$(PERL5_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"foo.dll" !ENDIF diff --git a/Examples/perl5/import/spam.dsp b/Examples/perl5/import/spam.dsp index 7d52ce128..de833fac4 100644 --- a/Examples/perl5/import/spam.dsp +++ b/Examples/perl5/import/spam.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /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 "$(PERL5_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "spam - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PERL5_LIB)" ..\..\..\Runtime\swigpl.lib /nologo /dll /machine:I386 /out:"spam.dll" +# 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 "$(PERL5_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"spam.dll" !ENDIF diff --git a/Examples/python/import/README b/Examples/python/import/README index a473bd12f..9d4a8305b 100644 --- a/Examples/python/import/README +++ b/Examples/python/import/README @@ -34,8 +34,10 @@ Unix: Windows: -------- -- Use the Visual C++ 6 workspace file (example.dsw). Build each project - to create the 5 DLLs. The Batch build option in the Build menu is the - easiest way to do this. Only use the Release builds not the Debug builds. +- Use the Visual C++ 6 workspace file (example.dsw). Build the runtime + project DLL first followed by the other 4 DLLs as they all have a + dependency on the runtime DLL. The Batch build option in the Build menu + is usually the easiest way to do this. Only use the Release builds not + the Debug builds. - Run the test as described above diff --git a/Examples/python/import/bar.dsp b/Examples/python/import/bar.dsp index beb64b926..41860a65e 100644 --- a/Examples/python/import/bar.dsp +++ b/Examples/python/import/bar.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /debug /machine:I386 /out:"_bar.dll" /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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"_bar.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "bar - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /machine:I386 /out:"_bar.dll" +# 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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_bar.dll" !ENDIF diff --git a/Examples/python/import/base.dsp b/Examples/python/import/base.dsp index 071a1a8e4..38173e447 100644 --- a/Examples/python/import/base.dsp +++ b/Examples/python/import/base.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /debug /machine:I386 /out:"_base.dll" /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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"_base.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "base - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /machine:I386 /out:"_base.dll" +# 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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_base.dll" !ENDIF diff --git a/Examples/python/import/example.dsw b/Examples/python/import/example.dsw index 496c21544..0c2fe7504 100644 --- a/Examples/python/import/example.dsw +++ b/Examples/python/import/example.dsw @@ -11,6 +11,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -23,6 +26,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -33,6 +39,21 @@ Package=<5> {{{ }}} +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency +}}} + +############################################################################### + +Project: "runtime"=.\runtime.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + Package=<4> {{{ }}} @@ -47,6 +68,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### diff --git a/Examples/python/import/foo.dsp b/Examples/python/import/foo.dsp index 3a0266a9e..06ee9213f 100644 --- a/Examples/python/import/foo.dsp +++ b/Examples/python/import/foo.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /debug /machine:I386 /out:"_foo.dll" /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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"_foo.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "foo - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /machine:I386 /out:"_foo.dll" +# 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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_foo.dll" !ENDIF diff --git a/Examples/python/import/spam.dsp b/Examples/python/import/spam.dsp index b81ebffa4..e30cde069 100644 --- a/Examples/python/import/spam.dsp +++ b/Examples/python/import/spam.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /debug /machine:I386 /out:"_spam.dll" /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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"_spam.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "spam - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.lib /nologo /dll /machine:I386 /out:"_spam.dll" +# 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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_spam.dll" !ENDIF diff --git a/Examples/ruby/import/README b/Examples/ruby/import/README index 1a4b5b353..ffd835c7e 100644 --- a/Examples/ruby/import/README +++ b/Examples/ruby/import/README @@ -34,8 +34,10 @@ Unix: Windows: -------- -- Use the Visual C++ 6 workspace file (example.dsw). Build each project - to create the 5 DLLs. The Batch build option in the Build menu is the - easiest way to do this. Only use the Release builds not the Debug builds. +- Use the Visual C++ 6 workspace file (example.dsw). Build the runtime + project DLL first followed by the other 4 DLLs as they all have a + dependency on the runtime DLL. The Batch build option in the Build menu + is usually the easiest way to do this. Only use the Release builds not + the Debug builds. - Run the test as described above diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp index f1fd5d8c6..2a9357dfc 100644 --- a/Examples/ruby/import/bar.dsp +++ b/Examples/ruby/import/bar.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "bar - Win32 Release" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /machine:I386 /out:"bar.dll" +# 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"bar.dll" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp index 57009c4ff..05c90b7ec 100644 --- a/Examples/ruby/import/base.dsp +++ b/Examples/ruby/import/base.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /debug /machine:I386 /out:"base.dll" /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"base.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "base - Win32 Release" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /machine:I386 /out:"base.dll" +# 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"base.dll" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/Examples/ruby/import/example.dsw b/Examples/ruby/import/example.dsw index 496c21544..0c2fe7504 100644 --- a/Examples/ruby/import/example.dsw +++ b/Examples/ruby/import/example.dsw @@ -11,6 +11,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -23,6 +26,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -33,6 +39,21 @@ Package=<5> {{{ }}} +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency +}}} + +############################################################################### + +Project: "runtime"=.\runtime.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + Package=<4> {{{ }}} @@ -47,6 +68,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp index 17de87f4a..3d193f4a5 100644 --- a/Examples/ruby/import/foo.dsp +++ b/Examples/ruby/import/foo.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "foo - Win32 Release" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /machine:I386 /out:"foo.dll" +# 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"foo.dll" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp index ee523a3fb..8b8246f52 100644 --- a/Examples/ruby/import/spam.dsp +++ b/Examples/ruby/import/spam.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "spam - Win32 Release" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(RUBY_LIB)" ..\..\..\Runtime\swigrb.lib /nologo /dll /machine:I386 /out:"spam.dll" +# 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"spam.dll" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/Examples/tcl/import/README b/Examples/tcl/import/README index 006b3f00c..719a61bfd 100644 --- a/Examples/tcl/import/README +++ b/Examples/tcl/import/README @@ -34,8 +34,10 @@ Unix: Windows: -------- -- Use the Visual C++ 6 workspace file (example.dsw). Build each project - to create the 5 DLLs. The Batch build option in the Build menu is the - easiest way to do this. Only use the Release builds not the Debug builds. +- Use the Visual C++ 6 workspace file (example.dsw). Build the runtime + project DLL first followed by the other 4 DLLs as they all have a + dependency on the runtime DLL. The Batch build option in the Build menu + is usually the easiest way to do this. Only use the Release builds not + the Debug builds. - Run the test as described above diff --git a/Examples/tcl/import/bar.dsp b/Examples/tcl/import/bar.dsp index b2809815a..2127fed72 100644 --- a/Examples/tcl/import/bar.dsp +++ b/Examples/tcl/import/bar.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "bar - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /machine:I386 /out:"bar.dll" +# 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"bar.dll" !ENDIF diff --git a/Examples/tcl/import/base.dsp b/Examples/tcl/import/base.dsp index 787f0a174..306eb614e 100644 --- a/Examples/tcl/import/base.dsp +++ b/Examples/tcl/import/base.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /debug /machine:I386 /out:"base.dll" /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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"base.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "base - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /machine:I386 /out:"base.dll" +# 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"base.dll" !ENDIF diff --git a/Examples/tcl/import/example.dsw b/Examples/tcl/import/example.dsw index 496c21544..0c2fe7504 100644 --- a/Examples/tcl/import/example.dsw +++ b/Examples/tcl/import/example.dsw @@ -11,6 +11,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -23,6 +26,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### @@ -33,6 +39,21 @@ Package=<5> {{{ }}} +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency +}}} + +############################################################################### + +Project: "runtime"=.\runtime.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + Package=<4> {{{ }}} @@ -47,6 +68,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} ############################################################################### diff --git a/Examples/tcl/import/foo.dsp b/Examples/tcl/import/foo.dsp index 7477f8a5f..416e6b38c 100644 --- a/Examples/tcl/import/foo.dsp +++ b/Examples/tcl/import/foo.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "foo - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /machine:I386 /out:"foo.dll" +# 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"foo.dll" !ENDIF diff --git a/Examples/tcl/import/spam.dsp b/Examples/tcl/import/spam.dsp index f03fa1408..c32ad05b1 100644 --- a/Examples/tcl/import/spam.dsp +++ b/Examples/tcl/import/spam.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /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 "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "spam - Win32 Release" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "$(TCL_LIB)" ..\..\..\Runtime\swigtcl8.lib /nologo /dll /machine:I386 /out:"spam.dll" +# 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"spam.dll" !ENDIF