From: <sag...@us...> - 2012-10-27 13:01:36
|
Revision: 1388 http://modplug.svn.sourceforge.net/modplug/?rev=1388&view=rev Author: saga-games Date: 2012-10-27 13:01:27 +0000 (Sat, 27 Oct 2012) Log Message: ----------- Merged revision(s) 1378-1382 from branches/manx/project-files-cleanups: branch project-files-cleanups ........ [Var] Remove old VC6 project files. ........ [Var] Remove ReleaseWithoutAsm target and x64 platform from VS2010 solution file, they had probably sneaked in from zlib some time ago. ........ [Var] Remove 'SuppressStartupBanner' setting from VS2010 project files because this setting is deprecated and causes a warning. ........ [Var] Use multiprocessor compilation (/MP) in release builds with VS2010 to reduce build times. "/MP" is disabled for stdafx.cpp compiles as it does not work when generating a PCH and would cause a warning. ........ Modified Paths: -------------- trunk/OpenMPT/mptrack/MPTRACK_10.sln trunk/OpenMPT/mptrack/mptrack_10.vcxproj trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj trunk/OpenMPT/ungzip/ungzip_10.vcxproj trunk/OpenMPT/unlha/unlha_10.vcxproj trunk/OpenMPT/unrar/unrar_10.vcxproj trunk/OpenMPT/unzip/unzip_10.vcxproj trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj trunk/OpenMPT/zlib/contrib/vstudio/vc10/zlibstat.vcxproj Removed Paths: ------------- trunk/OpenMPT/mptrack/MPTRACK.DSW trunk/OpenMPT/mptrack/mptrack.dsp Property Changed: ---------------- trunk/OpenMPT/ Property changes on: trunk/OpenMPT ___________________________________________________________________ Added: svn:mergeinfo + /branches/manx/project-files-cleanups:1378-1382 Deleted: trunk/OpenMPT/mptrack/MPTRACK.DSW =================================================================== --- trunk/OpenMPT/mptrack/MPTRACK.DSW 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/mptrack/MPTRACK.DSW 2012-10-27 13:01:27 UTC (rev 1388) @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "mptrack"=.\mptrack.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name unlha - End Project Dependency - Begin Project Dependency - Project_Dep_Name unrar - End Project Dependency - Begin Project Dependency - Project_Dep_Name unzip - End Project Dependency -}}} - -############################################################################### - -Project: "unlha"=..\unlha\unlha.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "unrar"=..\UNRAR\UNRAR.DSP - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "unzip"=..\UNZIP\unzip.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Modified: trunk/OpenMPT/mptrack/MPTRACK_10.sln =================================================================== --- trunk/OpenMPT/mptrack/MPTRACK_10.sln 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/mptrack/MPTRACK_10.sln 2012-10-27 13:01:27 UTC (rev 1388) @@ -19,88 +19,41 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32 - ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.ActiveCfg = Debug|Win32 {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.Build.0 = Debug|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|x64.ActiveCfg = Debug|Win32 {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.ActiveCfg = Release|Win32 {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.Build.0 = Release|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|x64.ActiveCfg = Release|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Debug|Win32.ActiveCfg = Debug|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Debug|Win32.Build.0 = Debug|Win32 - {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Debug|x64.ActiveCfg = Debug|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Release|Win32.ActiveCfg = Release|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Release|Win32.Build.0 = Release|Win32 - {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Release|x64.ActiveCfg = Release|Win32 - {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Debug|Win32.ActiveCfg = Debug|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Debug|Win32.Build.0 = Debug|Win32 - {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Debug|x64.ActiveCfg = Debug|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Release|Win32.ActiveCfg = Release|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Release|Win32.Build.0 = Release|Win32 - {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Release|x64.ActiveCfg = Release|Win32 - {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {44316F22-904E-48AA-B841-5A3A6AC77319}.Debug|Win32.ActiveCfg = Debug|Win32 {44316F22-904E-48AA-B841-5A3A6AC77319}.Debug|Win32.Build.0 = Debug|Win32 - {44316F22-904E-48AA-B841-5A3A6AC77319}.Debug|x64.ActiveCfg = Debug|Win32 {44316F22-904E-48AA-B841-5A3A6AC77319}.Release|Win32.ActiveCfg = Release|Win32 {44316F22-904E-48AA-B841-5A3A6AC77319}.Release|Win32.Build.0 = Release|Win32 - {44316F22-904E-48AA-B841-5A3A6AC77319}.Release|x64.ActiveCfg = Release|Win32 - {44316F22-904E-48AA-B841-5A3A6AC77319}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {44316F22-904E-48AA-B841-5A3A6AC77319}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {44316F22-904E-48AA-B841-5A3A6AC77319}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Debug|Win32.ActiveCfg = Debug|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Debug|Win32.Build.0 = Debug|Win32 - {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Debug|x64.ActiveCfg = Debug|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Release|Win32.ActiveCfg = Release|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Release|Win32.Build.0 = Release|Win32 - {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Release|x64.ActiveCfg = Release|Win32 - {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Debug|Win32.ActiveCfg = Debug|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Debug|Win32.Build.0 = Debug|Win32 - {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Debug|x64.ActiveCfg = Debug|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Release|Win32.ActiveCfg = Release|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Release|Win32.Build.0 = Release|Win32 - {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Release|x64.ActiveCfg = Release|Win32 - {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Debug|Win32.ActiveCfg = Debug|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Debug|Win32.Build.0 = Debug|Win32 - {94CD7910-649A-4075-9F33-7EBEE614FD45}.Debug|x64.ActiveCfg = Debug|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Release|Win32.ActiveCfg = Release|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Release|Win32.Build.0 = Release|Win32 - {94CD7910-649A-4075-9F33-7EBEE614FD45}.Release|x64.ActiveCfg = Release|Win32 - {94CD7910-649A-4075-9F33-7EBEE614FD45}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {94CD7910-649A-4075-9F33-7EBEE614FD45}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {94CD7910-649A-4075-9F33-7EBEE614FD45}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Deleted: trunk/OpenMPT/mptrack/mptrack.dsp =================================================================== --- trunk/OpenMPT/mptrack/mptrack.dsp 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/mptrack/mptrack.dsp 2012-10-27 13:01:27 UTC (rev 1388) @@ -1,584 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mptrack" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=mptrack - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mptrack.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mptrack.mak" CFG="mptrack - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mptrack - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "mptrack - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mptrack - Win32 Release" - -# PROP BASE Use_MFC 5 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 5 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Bin" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "..\unlha" /I "..\unzip" /I "..\unrar" /I "..\soundlib" /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ENABLE_MMX" /D "ENABLE_EQ" /D "MODPLUG_TRACKER" /D "NO_PACKING" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 winmm.lib strmiids.lib dmoguids.lib /nologo /version:5.0 /pdb:none /map /machine:I386 /subsystem:windows,4.0 -# SUBTRACT LINK32 /profile - -!ELSEIF "$(CFG)" == "mptrack - Win32 Debug" - -# PROP BASE Use_MFC 5 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 5 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /G5 /MTd /W4 /GX /Zi /Od /Gf /Gy /I "..\unzip" /I "..\unrar" /I "..\unlha" /I "..\soundlib" /I "..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ENABLE_EQ" /D "MODPLUG_TRACKER" /D "NO_PACKING" /FR /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 winmm.lib strmiids.lib dmoguids.lib /nologo /version:5.0 /subsystem:windows /incremental:no /map /debug /machine:I386 /libpath:"..\unzip\bin" /libpath:"..\unrar\bin" /libpath:"..\unlha\bin" -# SUBTRACT LINK32 /profile - -!ENDIF - -# Begin Target - -# Name "mptrack - Win32 Release" -# Name "mptrack - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ChildFrm.cpp -# End Source File -# Begin Source File - -SOURCE=.\ctrl_com.cpp -# End Source File -# Begin Source File - -SOURCE=.\ctrl_gen.cpp -# End Source File -# Begin Source File - -SOURCE=.\ctrl_ins.cpp -# End Source File -# Begin Source File - -SOURCE=.\ctrl_pat.cpp -# End Source File -# Begin Source File - -SOURCE=.\ctrl_seq.cpp -# End Source File -# Begin Source File - -SOURCE=.\ctrl_smp.cpp -# End Source File -# Begin Source File - -SOURCE=.\dlg_misc.cpp - -!IF "$(CFG)" == "mptrack - Win32 Release" - -# ADD CPP /O2 - -!ELSEIF "$(CFG)" == "mptrack - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\soundlib\dlsbank.cpp -# End Source File -# Begin Source File - -SOURCE=.\draw_pat.cpp -# End Source File -# Begin Source File - -SOURCE=.\EffectVis.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Fastmix.cpp -# End Source File -# Begin Source File - -SOURCE=.\globals.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_669.cpp -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\load_amf.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_ams.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\load_dbm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\load_dmf.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_dsm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_far.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_it.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_mdl.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_med.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\load_mid.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_mod.cpp -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\load_mt2.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_mtm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_okt.cpp -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\load_psm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\load_ptm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_s3m.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_stm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_ult.cpp -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\Load_umx.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_wav.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Load_xm.cpp -# End Source File -# Begin Source File - -SOURCE=.\mainbar.cpp -# End Source File -# Begin Source File - -SOURCE=.\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\mmcmp.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Mmx_mix.cpp -# End Source File -# Begin Source File - -SOURCE=.\mod2midi.cpp -# End Source File -# Begin Source File - -SOURCE=.\mod2wave.cpp -# End Source File -# Begin Source File - -SOURCE=.\moddoc.cpp -# End Source File -# Begin Source File - -SOURCE=.\modedit.cpp -# End Source File -# Begin Source File - -SOURCE=.\Moptions.cpp -# End Source File -# Begin Source File - -SOURCE=.\Mpdlgs.cpp -# End Source File -# Begin Source File - -SOURCE=.\mpt_midi.cpp -# End Source File -# Begin Source File - -SOURCE=.\mptrack.cpp -# End Source File -# Begin Source File - -SOURCE=.\mptrack.rc -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Sampleio.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\snd_dsp.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\snd_eq.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\snd_flt.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Snd_fx.cpp -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\Snd_rvb.cpp - -!IF "$(CFG)" == "mptrack - Win32 Release" - -# ADD CPP /FAs - -!ELSEIF "$(CFG)" == "mptrack - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\snddev.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Sndfile.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Sndmix.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Tables.cpp -# End Source File -# Begin Source File - -SOURCE=.\view_com.cpp -# End Source File -# Begin Source File - -SOURCE=.\view_gen.cpp -# End Source File -# Begin Source File - -SOURCE=.\view_ins.cpp -# End Source File -# Begin Source File - -SOURCE=.\view_pat.cpp -# End Source File -# Begin Source File - -SOURCE=.\view_smp.cpp -# End Source File -# Begin Source File - -SOURCE=.\view_tre.cpp -# End Source File -# Begin Source File - -SOURCE=.\vstplug.cpp -# End Source File -# Begin Source File - -SOURCE=..\soundlib\Waveform.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ChildFrm.h -# End Source File -# Begin Source File - -SOURCE=.\ctrl_com.h -# End Source File -# Begin Source File - -SOURCE=.\ctrl_gen.h -# End Source File -# Begin Source File - -SOURCE=.\ctrl_ins.h -# End Source File -# Begin Source File - -SOURCE=.\ctrl_pat.h -# End Source File -# Begin Source File - -SOURCE=.\ctrl_smp.h -# End Source File -# Begin Source File - -SOURCE=.\dlg_misc.h -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\Dlsbank.h -# End Source File -# Begin Source File - -SOURCE=.\EffectVis.h -# End Source File -# Begin Source File - -SOURCE=.\globals.h -# End Source File -# Begin Source File - -SOURCE=.\mainbar.h -# End Source File -# Begin Source File - -SOURCE=.\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=.\mod2midi.h -# End Source File -# Begin Source File - -SOURCE=.\mod2wave.h -# End Source File -# Begin Source File - -SOURCE=.\moddoc.h -# End Source File -# Begin Source File - -SOURCE=.\Moptions.h -# End Source File -# Begin Source File - -SOURCE=.\Mpdlgs.h -# End Source File -# Begin Source File - -SOURCE=.\mptrack.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\snddev.h -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\snddevx.h -# End Source File -# Begin Source File - -SOURCE=..\Soundlib\Sndfile.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\view_com.h -# End Source File -# Begin Source File - -SOURCE=.\view_gen.h -# End Source File -# Begin Source File - -SOURCE=.\view_ins.h -# End Source File -# Begin Source File - -SOURCE=.\view_pat.h -# End Source File -# Begin Source File - -SOURCE=.\view_smp.h -# End Source File -# Begin Source File - -SOURCE=.\view_tre.h -# End Source File -# Begin Source File - -SOURCE=.\vstplug.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\colors.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\dragging.cur -# End Source File -# Begin Source File - -SOURCE=.\Res\envbar.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\img_list.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\mainbar.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\moddoc.ico -# End Source File -# Begin Source File - -SOURCE=.\res\MPTRACK.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\mptrack.ico -# End Source File -# Begin Source File - -SOURCE=.\res\mptrack.rc2 -# End Source File -# Begin Source File - -SOURCE=.\Res\nodrag.cur -# End Source File -# Begin Source File - -SOURCE=.\res\nodrop.cur -# End Source File -# Begin Source File - -SOURCE=.\res\patterns.bmp -# End Source File -# Begin Source File - -SOURCE=.\Res\smptoolb.bmp -# End Source File -# Begin Source File - -SOURCE=.\Res\splash.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\view_pat.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\vumeters.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=.\mptrack.reg -# End Source File -# End Target -# End Project Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj =================================================================== --- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -78,7 +78,6 @@ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> <BrowseInformation>true</BrowseInformation> <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <CompileAs>Default</CompileAs> </ClCompile> @@ -133,13 +132,13 @@ <ObjectFileName>.\Release/</ObjectFileName> <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <ExceptionHandling>Async</ExceptionHandling> <AdditionalOptions>/O2 %(AdditionalOptions)</AdditionalOptions> <IntrinsicFunctions>true</IntrinsicFunctions> <FloatingPointModel>Fast</FloatingPointModel> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -261,6 +260,7 @@ <ClCompile Include="StdAfx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</MultiProcessorCompilation> </ClCompile> <ClCompile Include="..\soundlib\Tables.cpp" /> <ClCompile Include="tagging.cpp" /> Modified: trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj =================================================================== --- trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -84,6 +84,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> Modified: trunk/OpenMPT/ungzip/ungzip_10.vcxproj =================================================================== --- trunk/OpenMPT/ungzip/ungzip_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/ungzip/ungzip_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -62,10 +62,10 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> <DebugInformationFormat> </DebugInformationFormat> <OmitDefaultLibName>true</OmitDefaultLibName> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/OpenMPT/unlha/unlha_10.vcxproj =================================================================== --- trunk/OpenMPT/unlha/unlha_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/unlha/unlha_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -58,7 +58,6 @@ <ObjectFileName>.\Debug/</ObjectFileName> <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <ResourceCompile> @@ -85,7 +84,7 @@ <ObjectFileName>.\Release/</ObjectFileName> <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: trunk/OpenMPT/unrar/unrar_10.vcxproj =================================================================== --- trunk/OpenMPT/unrar/unrar_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/unrar/unrar_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -55,7 +55,6 @@ <ObjectFileName>.\Debug/</ObjectFileName> <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <ResourceCompile> @@ -81,7 +80,7 @@ <ObjectFileName>.\Release/</ObjectFileName> <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <ResourceCompile> <Culture>0x0409</Culture> Modified: trunk/OpenMPT/unzip/unzip_10.vcxproj =================================================================== --- trunk/OpenMPT/unzip/unzip_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/unzip/unzip_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -55,7 +55,6 @@ <ObjectFileName>.\Debug/</ObjectFileName> <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> <WarningLevel>Level4</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <ResourceCompile> @@ -81,7 +80,7 @@ <ObjectFileName>.\Release/</ObjectFileName> <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <ResourceCompile> <Culture>0x0409</Culture> Modified: trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj =================================================================== --- trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -67,8 +67,8 @@ <BufferSecurityCheck>true</BufferSecurityCheck> <PrecompiledHeader>Use</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>false</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Lib> <OutputFile>$(OutDir)xsoundlib.lib</OutputFile> @@ -85,6 +85,7 @@ <ClCompile Include="stdafx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</MultiProcessorCompilation> </ClCompile> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/zlib/contrib/vstudio/vc10/zlibstat.vcxproj =================================================================== --- trunk/OpenMPT/zlib/contrib/vstudio/vc10/zlibstat.vcxproj 2012-10-27 12:21:51 UTC (rev 1387) +++ trunk/OpenMPT/zlib/contrib/vstudio/vc10/zlibstat.vcxproj 2012-10-27 13:01:27 UTC (rev 1388) @@ -171,7 +171,6 @@ <ObjectFileName>$(IntDir)</ObjectFileName> <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>OldStyle</DebugInformationFormat> </ClCompile> <ResourceCompile> @@ -199,7 +198,7 @@ <ObjectFileName>$(IntDir)</ObjectFileName> <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> - <SuppressStartupBanner>true</SuppressStartupBanner> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <ResourceCompile> <Culture>0x040c</Culture> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |