mirror of
				https://github.com/cookiengineer/audacity
				synced 2025-10-31 14:13:50 +01:00 
			
		
		
		
	Fix build of Nyquist Workbench
This commit is contained in:
		| @@ -14,6 +14,7 @@ | ||||
| #include <wx/filedlg.h> | ||||
| #include <wx/font.h> | ||||
| #include <wx/fontdlg.h> | ||||
| #include <wx/msgdlg.h> | ||||
| #include <wx/settings.h> | ||||
| #include <wx/sizer.h> | ||||
| #include <wx/splitter.h> | ||||
| @@ -84,6 +85,35 @@ | ||||
| #include "images/media-playback-start-large.xpm" | ||||
| #include "images/media-playback-stop-large.xpm" | ||||
|  | ||||
| #if defined(__WXMSW__) | ||||
| #include <wx/init.h> | ||||
| #  if defined(__WXDEBUG__) | ||||
| #     define D "d" | ||||
| #  else | ||||
| #     define D "" | ||||
| #  endif | ||||
| #  if wxCHECK_VERSION(3, 1, 0) | ||||
| #     define V "31" | ||||
| #  elif wxCHECK_VERSION(3, 0, 0) | ||||
| #     define V "30" | ||||
| #  else | ||||
| #     define V "28" | ||||
| #  endif | ||||
|  | ||||
| #  pragma comment(lib, "wxbase" V "u" D) | ||||
| #  pragma comment(lib, "wxbase" V "u" D "_net") | ||||
| #  pragma comment(lib, "wxmsw"  V "u" D "_adv") | ||||
| #  pragma comment(lib, "wxmsw"  V "u" D "_core") | ||||
| #  pragma comment(lib, "wxmsw"  V "u" D "_html") | ||||
| #  pragma comment(lib, "wxpng"        D) | ||||
| #  pragma comment(lib, "wxzlib"       D) | ||||
| #  pragma comment(lib, "wxjpeg"       D) | ||||
| #  pragma comment(lib, "wxtiff"       D) | ||||
|  | ||||
| #  undef V | ||||
| #  undef D | ||||
|  | ||||
| #endif //(__WXMSW__) | ||||
| /* | ||||
| There are several functions that can be used in a GUI module. | ||||
|  | ||||
|   | ||||
| @@ -65,7 +65,7 @@ | ||||
|       <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>audacity.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalDependencies>audacity.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <OutputFile>..\..\win\$(ConfigurationName)\modules\$(ProjectName).dll</OutputFile> | ||||
|       <AdditionalLibraryDirectories>..\..\win/$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
|       <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
| @@ -90,7 +90,7 @@ copy "$(TargetPath)" "%25dest%25" | ||||
|       <WarningLevel>Level3</WarningLevel> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>audacity.lib;wxbase28u.lib;wxbase30u_net.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxmsw30u_html.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalDependencies>audacity.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <OutputFile>..\..\win\$(ConfigurationName)\modules\$(ProjectName).dll</OutputFile> | ||||
|       <AdditionalLibraryDirectories>../../win/$(Configuration);$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
|       <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user