[OMPT-svn-commit] SF.net SVN: modplug:[5069] trunk/OpenMPT

[<man...@us...>]

Revision: 5069
          http://sourceforge.net/p/modplug/code/5069
Author:   manxorist
Date:     2015-05-10 11:49:30 +0000 (Sun, 10 May 2015)
Log Message:
-----------
[Fix] build: Premake5 should also generate in_openmpt and xmp-openmpt projects for VS > VS2010.
[Doc] libopenmpt: Update docs to new MSVC build system.
[Doc] libopenmpt: libopenmpt_Settings.dll is long gone.

Modified Paths:
--------------
    trunk/OpenMPT/README.md
    trunk/OpenMPT/build/premake4-win/premake.lua
    trunk/OpenMPT/build/regenerate_vs_projects.cmd
    trunk/OpenMPT/libopenmpt/dox/changelog.md
    trunk/OpenMPT/libopenmpt/dox/dependencies.md
    trunk/OpenMPT/libopenmpt/dox/quickstart.md

Modified: trunk/OpenMPT/README.md
===================================================================
--- trunk/OpenMPT/README.md	2015-05-10 09:51:57 UTC (rev 5068)
+++ trunk/OpenMPT/README.md	2015-05-10 11:49:30 UTC (rev 5069)
@@ -96,10 +96,23 @@
         make check
         sudo make install
 
- -  Visual Studio 2010 (express version should work, but this is not tested):
+ -  Visual Studio:
 
-     -  The libopenmpt solution is in `libopenmpt/libopenmpt.sln`.
-        You will need the Winamp 5 SDK and the xmplay SDK if you want to
+     -  You will find solutions for Visual Studio 2008 to 2015 in the
+        corresponding `build/vsVERSION/` folder.
+        Most projects are supported with any of the mentioned Visual Studio
+        verions, with the following exceptions:
+
+         -  libopenmpt_example_cxx: Requires VS2010 because it makes use of
+            C++11 features that VS2008 does not support..
+
+         -  foo_openmpt: Requires VS2010 because the foobar2000 SDK uses VS2010.
+
+         -  in_openmpt: Requires VS2010 or later with MFC.
+
+         -  xmp-openmpt: Requires VS2010 or later with MFC.
+
+     -  You will need the Winamp 5 SDK and the xmplay SDK if you want to
         compile the plugins for these 2 players:
 
          -  Winamp 5 SDK:
@@ -121,8 +134,6 @@
             download to SDK.
             You can disable xmp-openmpt in the solution configuration.
 
-     -  The openmpt123 solution is in `openmpt123/openmpt123.sln`.
-
  -  Makefile
 
     The makefile supports different build environments and targets via the

Modified: trunk/OpenMPT/build/premake4-win/premake.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/premake.lua	2015-05-10 09:51:57 UTC (rev 5068)
+++ trunk/OpenMPT/build/premake4-win/premake.lua	2015-05-10 11:49:30 UTC (rev 5069)
@@ -176,6 +176,8 @@
   postprocess_vs2010_main("build/vs2012/libopenmpt_example_c.vcxproj")
   postprocess_vs2010_main("build/vs2012/libopenmpt_example_c_mem.vcxproj")
   postprocess_vs2010_main("build/vs2012/libopenmpt_example_cxx.vcxproj")
+  postprocess_vs2010_mfc("build/vs2012/in_openmpt.vcxproj")
+  postprocess_vs2010_mfc("build/vs2012/xmp-openmpt.vcxproj")
   postprocess_vs2010_mfc("build/vs2012/OpenMPT.vcxproj")
   postprocess_vs2010_dynamicbase("build/vs2012/OpenMPT.vcxproj")
   postprocess_vs2010_nonxcompat("build/vs2012/OpenMPT.vcxproj")
@@ -189,6 +191,8 @@
   postprocess_vs2010_main("build/vs2013/libopenmpt_example_c.vcxproj")
   postprocess_vs2010_main("build/vs2013/libopenmpt_example_c_mem.vcxproj")
   postprocess_vs2010_main("build/vs2013/libopenmpt_example_cxx.vcxproj")
+  postprocess_vs2010_mfc("build/vs2013/in_openmpt.vcxproj")
+  postprocess_vs2010_mfc("build/vs2013/xmp-openmpt.vcxproj")
   postprocess_vs2010_mfc("build/vs2013/OpenMPT.vcxproj")
   postprocess_vs2010_dynamicbase("build/vs2013/OpenMPT.vcxproj")
   postprocess_vs2010_nonxcompat("build/vs2013/OpenMPT.vcxproj")
@@ -202,6 +206,8 @@
   postprocess_vs2010_main("build/vs2015/libopenmpt_example_c.vcxproj")
   postprocess_vs2010_main("build/vs2015/libopenmpt_example_c_mem.vcxproj")
   postprocess_vs2010_main("build/vs2015/libopenmpt_example_cxx.vcxproj")
+  postprocess_vs2010_mfc("build/vs2015/in_openmpt.vcxproj")
+  postprocess_vs2010_mfc("build/vs2015/xmp-openmpt.vcxproj")
   postprocess_vs2010_mfc("build/vs2015/OpenMPT.vcxproj")
   postprocess_vs2010_dynamicbase("build/vs2015/OpenMPT.vcxproj")
   postprocess_vs2010_nonxcompat("build/vs2015/OpenMPT.vcxproj")

Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd
===================================================================
--- trunk/OpenMPT/build/regenerate_vs_projects.cmd	2015-05-10 09:51:57 UTC (rev 5068)
+++ trunk/OpenMPT/build/regenerate_vs_projects.cmd	2015-05-10 11:49:30 UTC (rev 5069)
@@ -58,6 +58,8 @@
 include\premake\premake5.exe --group=all-externals vs2010 || goto err
 
 include\premake\premake5.exe --group=libopenmpt_test vs2012 || goto err
+include\premake\premake5.exe --group=in_openmpt vs2012 || goto err
+include\premake\premake5.exe --group=xmp-openmpt vs2012 || goto err
 include\premake\premake5.exe --group=libopenmpt vs2012 || goto err
 include\premake\premake5.exe --group=openmpt123 vs2012 || goto err
 include\premake\premake5.exe --group=PluginBridge vs2012 || goto err
@@ -65,6 +67,8 @@
 include\premake\premake5.exe --group=all-externals vs2012 || goto err
 
 include\premake\premake5.exe --group=libopenmpt_test vs2013 || goto err
+include\premake\premake5.exe --group=in_openmpt vs2013 || goto err
+include\premake\premake5.exe --group=xmp-openmpt vs2013 || goto err
 include\premake\premake5.exe --group=libopenmpt vs2013 || goto err
 include\premake\premake5.exe --group=openmpt123 vs2013 || goto err
 include\premake\premake5.exe --group=PluginBridge vs2013 || goto err
@@ -72,6 +76,8 @@
 include\premake\premake5.exe --group=all-externals vs2013 || goto err
 
 include\premake\premake5.exe --group=libopenmpt_test vs2015 || goto err
+include\premake\premake5.exe --group=in_openmpt vs2015 || goto err
+include\premake\premake5.exe --group=xmp-openmpt vs2015 || goto err
 include\premake\premake5.exe --group=libopenmpt vs2015 || goto err
 include\premake\premake5.exe --group=openmpt123 vs2015 || goto err
 include\premake\premake5.exe --group=PluginBridge vs2015 || goto err

Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md	2015-05-10 09:51:57 UTC (rev 5068)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md	2015-05-10 11:49:30 UTC (rev 5069)
@@ -5,6 +5,11 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt svn
+
+ *  [**Change**] The MSVC build system has been redone. Solutions are now
+    located in `build/vsVERSION/`.
+
 ### libopenmpt 0.2-beta12 (2015-04-19)
 
  *  Playback fix when row delay effect is used together with offset command.

Modified: trunk/OpenMPT/libopenmpt/dox/dependencies.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/dependencies.md	2015-05-10 09:51:57 UTC (rev 5068)
+++ trunk/OpenMPT/libopenmpt/dox/dependencies.md	2015-05-10 11:49:30 UTC (rev 5069)
@@ -9,7 +9,7 @@
 ### libopenmpt
 
  *  Supported compilers for building libopenmpt:
-     *  **Microsoft Visual Studio 2010** or higher (2008 is partially supported)
+     *  **Microsoft Visual Studio 2008** or higher
      *  **GCC 4.3** or higher (4.1 to 4.2 are partially supported)
      *  **Clang 3.0** or higher
      *  **MinGW-W64 4.6** or higher
@@ -34,7 +34,7 @@
 ### openmpt123
 
  *  Supported compilers for building openmpt:
-     *  **Microsoft Visual Studio 2010** or higher (2008 is partially supported)
+     *  **Microsoft Visual Studio 2008** or higher
      *  **GCC 4.3** or higher (4.1 to 4.2 are partially supported)
      *  **Clang 3.0** or higher
      *  **MinGW-W64 4.6** or higher

Modified: trunk/OpenMPT/libopenmpt/dox/quickstart.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/quickstart.md	2015-05-10 09:51:57 UTC (rev 5068)
+++ trunk/OpenMPT/libopenmpt/dox/quickstart.md	2015-05-10 11:49:30 UTC (rev 5069)
@@ -32,9 +32,9 @@
      -  **Winamp SDK**
      -  **XMPlay SDK**
  3. Checkout `http://svn.code.sf.net/p/modplug/code/trunk/OpenMPT/` .
- 4. Open `openmpt123\openmpt123.sln` or `libopenmpt\libopenmpt.sln` in *Microsoft Visual Studio 2010*.
+ 4. Open `build\vs2010\openmpt123.sln` or `build\vs2010\libopenmpt.sln` or `build\vs2010\xmp-openmpt.sln` or `build\vs2010\in_openmpt.sln` or `build\vs2010\foo_openmpt.sln` in *Microsoft Visual Studio 2010*.
  5. Select appropriate configuration and build. Binaries are generated in `bin\`
- 6. Drag a module onto `openmpt123.exe` or copy the player plugin DLLs (`in_openmpt.dll`, `xmp-openmpt.dll` or `foo_openmpt.dll`) and `libopenmpt_settings.dll` into the respective player directory.
+ 6. Drag a module onto `openmpt123.exe` or copy the player plugin DLLs (`in_openmpt.dll`, `xmp-openmpt.dll` or `foo_openmpt.dll`) into the respective player directory.
 
 ### Unix-like
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.