From 04d7108509ae053f03ce84fb06a83734c9030613 Mon Sep 17 00:00:00 2001 From: James Crook Date: Sat, 7 Apr 2018 12:00:33 +0100 Subject: [PATCH] Rejig mod-xxx building under Windows The project files move from lib-src into the win/Projects folder. Intermediate files are now kept well away from the files we want. Less use of '..' and more of $(SolutionPath) in paths. --- lib-src/mod-null/mod-null.sln | 22 -- lib-src/mod-null/mod-null.vcproj | 192 ------------------ lib-src/mod-nyq-bench/NyqBench.sln | 22 -- lib-src/mod-nyq-bench/Readme.txt | 10 +- lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj | 120 ----------- .../mod-nyq-bench.vcxproj.filters | 19 -- lib-src/mod-script-pipe/mod-script-pipe.sln | 22 -- .../mod-script-pipe.vcxproj.filters | 30 --- .../Projects}/mod-null/mod-null.vcxproj | 36 ++-- .../mod-null/mod-null.vcxproj.filters | 4 +- .../mod-nyq-bench/mod-nyq-bench.vcxproj | 38 ++-- .../mod-nyq-bench.vcxproj.filters | 9 + .../mod-script-pipe/mod-script-pipe.vcxproj | 18 +- win/audacity.sln | 22 +- 14 files changed, 78 insertions(+), 486 deletions(-) delete mode 100755 lib-src/mod-null/mod-null.sln delete mode 100644 lib-src/mod-null/mod-null.vcproj delete mode 100644 lib-src/mod-nyq-bench/NyqBench.sln delete mode 100755 lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj delete mode 100755 lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj.filters delete mode 100755 lib-src/mod-script-pipe/mod-script-pipe.sln delete mode 100755 lib-src/mod-script-pipe/mod-script-pipe.vcxproj.filters rename {lib-src => win/Projects}/mod-null/mod-null.vcxproj (77%) mode change 100755 => 100644 rename {lib-src => win/Projects}/mod-null/mod-null.vcxproj.filters (77%) mode change 100755 => 100644 rename lib-src/mod-script-pipe/mod-script-pipe.vcxproj => win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj (60%) mode change 100755 => 100644 create mode 100644 win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj.filters diff --git a/lib-src/mod-null/mod-null.sln b/lib-src/mod-null/mod-null.sln deleted file mode 100755 index 1d1180948..000000000 --- a/lib-src/mod-null/mod-null.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-null", "mod-null.vcxproj", "{5FF83E0C-1973-4559-94C3-311C9D0E051B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Debug|Win32.Build.0 = Debug|Win32 - {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Release|Win32.ActiveCfg = Release|Win32 - {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib-src/mod-null/mod-null.vcproj b/lib-src/mod-null/mod-null.vcproj deleted file mode 100644 index 7898a439b..000000000 --- a/lib-src/mod-null/mod-null.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib-src/mod-nyq-bench/NyqBench.sln b/lib-src/mod-nyq-bench/NyqBench.sln deleted file mode 100644 index ebf49a116..000000000 --- a/lib-src/mod-nyq-bench/NyqBench.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-nyq-bench", "mod-nyq-bench.vcxproj", "{4A36EB5E-CD32-40E3-AFB3-146369081D83}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4A36EB5E-CD32-40E3-AFB3-146369081D83}.Debug|Win32.ActiveCfg = Debug|Win32 - {4A36EB5E-CD32-40E3-AFB3-146369081D83}.Debug|Win32.Build.0 = Debug|Win32 - {4A36EB5E-CD32-40E3-AFB3-146369081D83}.Release|Win32.ActiveCfg = Release|Win32 - {4A36EB5E-CD32-40E3-AFB3-146369081D83}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib-src/mod-nyq-bench/Readme.txt b/lib-src/mod-nyq-bench/Readme.txt index b32fababa..a4498bfdd 100644 --- a/lib-src/mod-nyq-bench/Readme.txt +++ b/lib-src/mod-nyq-bench/Readme.txt @@ -3,19 +3,11 @@ Two things first... 1) This is only an example of a dynamic module. The interfaces it uses WILL change in the future. -2) The NyqBench effect is just my hairbrained idea and it +2) The NyqBench effect is just my (Leland Lucius) hairbrained idea and it may not produce desired results. For Mac and Linux user, you must change the AUDACITY_DIR variable at the top of your Makefile to point to the base of the Audacity source directory. -For Windows users, you need to define an environment variable -called AUDACITY_DIR whose value points to the base of the Audacity -source directory. - -The NyqBench.dll will automatically be copied to the Audacity -Modules directory in either the "win\Unicode Debug" or -"win\Unicode Release" subdirectories. - Other questions? Ask on the devel list. diff --git a/lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj b/lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj deleted file mode 100755 index 0241c6152..000000000 --- a/lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {4A36EB5E-CD32-40E3-AFB3-146369081D83} - NyqBench - Win32Proj - - - - DynamicLibrary - v120 - Unicode - true - - - DynamicLibrary - v120 - Unicode - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - false - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - false - - - - Disabled - $(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;../../include;../../win;../../src;../../src/include/win32;../../src/include;../../lib-src/libsndfile/win32;../../lib-src/libsndfile/src;../../lib-src/portaudio-v19/include;../../lib-src/portmixer/include;../../lib-src/portsmf;../../lib-src/libnyquist;%(AdditionalIncludeDirectories) - WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - - - audacity.lib;%(AdditionalDependencies) - ..\..\win\$(ConfigurationName)\modules\$(ProjectName).dll - ..\..\win/$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) - true - Windows - false - - MachineX86 - - - SET dest=%25AUDACITY_DIR%25\win\$(Configuration)\modules -IF NOT EXIST "%25dest%25" mkdir "%25dest%25" -copy "$(TargetPath)" "%25dest%25" - - - - - - $(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;../../include;../../win;../../src;../../src/include/win32;../../src/include;../../lib-src/libsndfile/win32;../../lib-src/libsndfile/src;../../lib-src/portaudio-v19/include;../../lib-src/portmixer/include;../../lib-src/portsmf;../../lib-src/libnyquist;%(AdditionalIncludeDirectories) - wxDEBUG_LEVEL=0;WXUSINGDLL;__WXMSW__;WIN32;NDEBUG;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - Level3 - - - audacity.lib;%(AdditionalDependencies) - ..\..\win\$(ConfigurationName)\modules\$(ProjectName).dll - ../../win/$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) - true - Windows - true - true - false - - MachineX86 - - - SET dest=%25AUDACITY_DIR%25\win\$(Configuration)\modules -IF NOT EXIST "%25dest%25" mkdir "%25dest%25" -copy "$(TargetPath)" "%25dest%25" - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj.filters b/lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj.filters deleted file mode 100755 index 29180d958..000000000 --- a/lib-src/mod-nyq-bench/mod-nyq-bench.vcxproj.filters +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/lib-src/mod-script-pipe/mod-script-pipe.sln b/lib-src/mod-script-pipe/mod-script-pipe.sln deleted file mode 100755 index 0ee3eea2f..000000000 --- a/lib-src/mod-script-pipe/mod-script-pipe.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-script-pipe", "mod-script-pipe.vcxproj", "{73BF0B4D-6EC3-49ED-87AE-E629F1CA2737}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {73BF0B4D-6EC3-49ED-87AE-E629F1CA2737}.Debug|Win32.ActiveCfg = Debug|Win32 - {73BF0B4D-6EC3-49ED-87AE-E629F1CA2737}.Debug|Win32.Build.0 = Debug|Win32 - {73BF0B4D-6EC3-49ED-87AE-E629F1CA2737}.Release|Win32.ActiveCfg = Release|Win32 - {73BF0B4D-6EC3-49ED-87AE-E629F1CA2737}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/lib-src/mod-script-pipe/mod-script-pipe.vcxproj.filters b/lib-src/mod-script-pipe/mod-script-pipe.vcxproj.filters deleted file mode 100755 index 3d09d8b5d..000000000 --- a/lib-src/mod-script-pipe/mod-script-pipe.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/lib-src/mod-null/mod-null.vcxproj b/win/Projects/mod-null/mod-null.vcxproj old mode 100755 new mode 100644 similarity index 77% rename from lib-src/mod-null/mod-null.vcxproj rename to win/Projects/mod-null/mod-null.vcxproj index cc047d17d..ea70e19d2 --- a/lib-src/mod-null/mod-null.vcxproj +++ b/win/Projects/mod-null/mod-null.vcxproj @@ -10,6 +10,12 @@ Win32 + + + + + + {5FF83E0C-1973-4559-94C3-311C9D0E051B} modtrackpanel2 @@ -41,33 +47,33 @@ <_ProjectFileVersion>12.0.30501.0 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true + $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ false Disabled - $(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;../../include;../../win;../../src;../../src/include/win32;../../src/include;../../lib-src/libsndfile/win32;../../lib-src/libsndfile/src;../../lib-src/portaudio-v19/include;../../lib-src/portmixer/include;../../lib-src/portsmf;../../lib-src/libnyquist;%(AdditionalIncludeDirectories) + $(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;$(SolutionDir);../../../include;../../../src;%(AdditionalIncludeDirectories) WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - EnableFastChecks - MultiThreadedDebugDLL true Level3 EditAndContinue true + EnableFastChecks + MultiThreadedDebugDLL audacity.lib;%(AdditionalDependencies) - ..\..\win\$(ConfigurationName)\modules\$(ProjectName).dll - ..\..\win/$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(SolutionDir)$(ConfigurationName)\modules\$(ProjectName).dll + $(SolutionDir)$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) true Windows false @@ -77,7 +83,7 @@ MaxSpeed true - $(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;../../include;../../win;../../src;../../src/include/win32;../../src/include;../../lib-src/libsndfile/win32;../../lib-src/libsndfile/src;../../lib-src/portaudio-v19/include;../../lib-src/portmixer/include;../../lib-src/portsmf;../../lib-src/libnyquist;%(AdditionalIncludeDirectories) + $(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;$(SolutionDir);../../../include;../../../src;%(AdditionalIncludeDirectories) wxDEBUG_LEVEL=0;WXUSINGDLL;__WXMSW__;WIN32;NDEBUG;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -86,8 +92,8 @@ audacity.lib;%(AdditionalDependencies) - ..\..\win\$(ConfigurationName)\modules\$(ProjectName).dll - ../../win/$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(SolutionDir)$(ConfigurationName)\modules\$(ProjectName).dll + $(SolutionDir)$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) true Windows true @@ -96,12 +102,6 @@ false - - - - - - diff --git a/lib-src/mod-null/mod-null.vcxproj.filters b/win/Projects/mod-null/mod-null.vcxproj.filters old mode 100755 new mode 100644 similarity index 77% rename from lib-src/mod-null/mod-null.vcxproj.filters rename to win/Projects/mod-null/mod-null.vcxproj.filters index 0308fdb9a..274d0e1fd --- a/lib-src/mod-null/mod-null.vcxproj.filters +++ b/win/Projects/mod-null/mod-null.vcxproj.filters @@ -7,12 +7,12 @@ - + Source Files - + Source Files diff --git a/lib-src/mod-script-pipe/mod-script-pipe.vcxproj b/win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj old mode 100755 new mode 100644 similarity index 60% rename from lib-src/mod-script-pipe/mod-script-pipe.vcxproj rename to win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj index ef11011fc..418983764 --- a/lib-src/mod-script-pipe/mod-script-pipe.vcxproj +++ b/win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj @@ -11,8 +11,8 @@ - {85774A29-EA2F-4A40-994F-6BE593D847A5} - modscriptpipe + {876BE9ED-1F80-47B6-A34A-1766A6639763} + modnyqbench @@ -39,23 +39,29 @@ - $(SolutionDir)$(Configuration)\modules\ + $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\modules\ + $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ + .dll Level3 Disabled - true - $(WXWIN31)\lib\vc_dll\mswud;$(WXWIN31)\include;..\..\win;%(AdditionalIncludeDirectories) - BUILDING_SCRIPT_PIPE;WXUSINGDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);_MBCS;%(PreprocessorDefinitions) + $(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;$(SolutionDir);..\..\..\include;..\..\..\src;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\libnyquist;%(AdditionalIncludeDirectories) + WXUSINGDLL;__WXMSW__;__WXDEBUG_;_DEBUG;_USRDLL;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - $(WXWIN31)\lib\vc_dll;%(AdditionalLibraryDirectories) - wxbase31ud.lib;wxbase31ud_net.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxmsw31ud_html.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) + audacity.lib;%(AdditionalDependencies) + $(SolutionDir)$(ConfigurationName)\modules\$(ProjectName).dll + Windows + false + true @@ -65,23 +71,23 @@ true true true - $(WXWIN31)\lib\vc_dll\mswu;$(WXWIN31)\include;..\..\win;%(AdditionalIncludeDirectories) - BUILDING_SCRIPT_PIPE;WXUSINGDLL;__WXMSW__;wxDEBUG_LEVEL=0;NDEBUG;WIN32;STRICT;_WINDOWS;_USRDLL;_MBCS;%(PreprocessorDefinitions) + $(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;$(SolutionDir);..\..\..\include;..\..\..\src;..\..\..\lib-src\portaudio-v19\include;..\..\..\lib-src\libnyquist;%(AdditionalIncludeDirectories) + wxDEBUG_LEVEL=0;WXUSINGDLL;__WXMSW__;WIN32;NDEBUG;STRICT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true true - $(WXWIN31)\lib\vc_dll;%(AdditionalLibraryDirectories) - wxbase31u.lib;wxbase31u_net.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxmsw31u_html.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) + audacity.lib;%(AdditionalDependencies) + $(SolutionDir)$(ConfigurationName)\modules\$(ProjectName).dll - - + - + diff --git a/win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj.filters b/win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj.filters new file mode 100644 index 000000000..634cbf4af --- /dev/null +++ b/win/Projects/mod-nyq-bench/mod-nyq-bench.vcxproj.filters @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/win/Projects/mod-script-pipe/mod-script-pipe.vcxproj b/win/Projects/mod-script-pipe/mod-script-pipe.vcxproj index fb9221bde..c923781e8 100755 --- a/win/Projects/mod-script-pipe/mod-script-pipe.vcxproj +++ b/win/Projects/mod-script-pipe/mod-script-pipe.vcxproj @@ -11,7 +11,7 @@ - {85774A29-EA2F-4A40-994F-6BE593D847A5} + {D41CD691-F111-4D68-B0C1-C90E7DB07454} mod-script-pipe @@ -41,12 +41,12 @@ <_ProjectFileVersion>11.0.60610.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(ProjectDir)$(Configuration)\ + $(ProjectDir)$(Configuration)\ @@ -60,8 +60,8 @@ Default - wxmsw28u_core.lib;wxbase28u.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;%(AdditionalDependencies) - $(OutDir)modules\$(ProjectName).dll + %(AdditionalDependencies) + $(SolutionDir)$(ConfigurationName)\modules\$(ProjectName).dll $(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) false @@ -81,8 +81,8 @@ Default - wxmsw30ud_core.lib;wxbase30ud.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;%(AdditionalDependencies) - $(OutDir)modules\$(ProjectName).dll + %(AdditionalDependencies) + $(SolutionDir)$(ConfigurationName)\modules\$(ProjectName).dll $(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories) true false diff --git a/win/audacity.sln b/win/audacity.sln index 4fd993972..096ca163b 100644 --- a/win/audacity.sln +++ b/win/audacity.sln @@ -53,7 +53,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv2", "Projects\lv2\lv2.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "Projects\expat\expat.vcxproj", "{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-script-pipe", "..\lib-src\mod-script-pipe\mod-script-pipe.vcxproj", "{85774A29-EA2F-4A40-994F-6BE593D847A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-null", "Projects\mod-null\mod-null.vcxproj", "{5FF83E0C-1973-4559-94C3-311C9D0E051B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-script-pipe", "Projects\mod-script-pipe\mod-script-pipe.vcxproj", "{D41CD691-F111-4D68-B0C1-C90E7DB07454}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod-nyq-bench", "Projects\mod-nyq-bench\mod-nyq-bench.vcxproj", "{876BE9ED-1F80-47B6-A34A-1766A6639763}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -156,10 +160,18 @@ Global {A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.ActiveCfg = Release|Win32 {A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.Build.0 = Release|Win32 {A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.Deploy.0 = Release|Win32 - {85774A29-EA2F-4A40-994F-6BE593D847A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {85774A29-EA2F-4A40-994F-6BE593D847A5}.Debug|Win32.Build.0 = Debug|Win32 - {85774A29-EA2F-4A40-994F-6BE593D847A5}.Release|Win32.ActiveCfg = Release|Win32 - {85774A29-EA2F-4A40-994F-6BE593D847A5}.Release|Win32.Build.0 = Release|Win32 + {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Debug|Win32.Build.0 = Debug|Win32 + {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Release|Win32.ActiveCfg = Release|Win32 + {5FF83E0C-1973-4559-94C3-311C9D0E051B}.Release|Win32.Build.0 = Release|Win32 + {D41CD691-F111-4D68-B0C1-C90E7DB07454}.Debug|Win32.ActiveCfg = Debug|Win32 + {D41CD691-F111-4D68-B0C1-C90E7DB07454}.Debug|Win32.Build.0 = Debug|Win32 + {D41CD691-F111-4D68-B0C1-C90E7DB07454}.Release|Win32.ActiveCfg = Release|Win32 + {D41CD691-F111-4D68-B0C1-C90E7DB07454}.Release|Win32.Build.0 = Release|Win32 + {876BE9ED-1F80-47B6-A34A-1766A6639763}.Debug|Win32.ActiveCfg = Debug|Win32 + {876BE9ED-1F80-47B6-A34A-1766A6639763}.Debug|Win32.Build.0 = Debug|Win32 + {876BE9ED-1F80-47B6-A34A-1766A6639763}.Release|Win32.ActiveCfg = Release|Win32 + {876BE9ED-1F80-47B6-A34A-1766A6639763}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE