Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4602] trunk/OpenMPT
|
From: <man...@us...> - 2014-11-19 18:10:02
|
Revision: 4602
http://sourceforge.net/p/modplug/code/4602
Author: manxorist
Date: 2014-11-19 18:09:53 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
[Imp] in_openmpt: Kill libopenmpt_settings.dll .
[Imp] xmp-popenmpt: Kill libopenmpt_settings.dll .
Modified Paths:
--------------
trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd
trunk/OpenMPT/libopenmpt/dox/changelog.md
trunk/OpenMPT/libopenmpt/in_openmpt.cpp
trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj
trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters
trunk/OpenMPT/libopenmpt/libopenmpt.sln
trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp
trunk/OpenMPT/libopenmpt/libopenmpt_settings.hpp
trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj
trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj.filters
Removed Paths:
-------------
trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj.filters
Modified: trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd 2014-11-19 18:09:53 UTC (rev 4602)
@@ -26,7 +26,7 @@
copy /y ..\..\libopenmpt\doc\foo_openmpt.txt .\ || goto error
copy /y ..\..\LICENSE .\ || goto error
copy /y ..\..\libopenmpt\dox\changelog.md .\ || goto error
-"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 libopenmpt-win32-r%GOT_REVISION%.7z libopenmpt.dll libmodplug.dll in_openmpt.dll xmp-openmpt.dll foo_openmpt.dll libopenmpt_settings.dll openmpt123.exe inc\libopenmpt\libopenmpt.h inc\libopenmpt\libopenmpt.hpp inc\libopenmpt\libopenmpt_config.h inc\libopenmpt\libopenmpt_version.h lib\Win32\libopenmpt.lib bin\Win32\libopenmpt.dll in_openmpt.txt xmp-openmpt.txt foo_openmpt.txt LICENSE changelog.md || goto error
+"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 libopenmpt-win32-r%GOT_REVISION%.7z libopenmpt.dll libmodplug.dll in_openmpt.dll xmp-openmpt.dll foo_openmpt.dll openmpt123.exe inc\libopenmpt\libopenmpt.h inc\libopenmpt\libopenmpt.hpp inc\libopenmpt\libopenmpt_config.h inc\libopenmpt\libopenmpt_version.h lib\Win32\libopenmpt.lib bin\Win32\libopenmpt.dll in_openmpt.txt xmp-openmpt.txt foo_openmpt.txt LICENSE changelog.md || goto error
"C:\Program Files\7-Zip\7z.exe" a -ttar libopenmpt-win32.tar libopenmpt-win32-r%GOT_REVISION%.7z || goto error
del /f /q libopenmpt-win32-r%GOT_REVISION%.7z
cd ..\.. || goto error
Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md 2014-11-19 18:09:53 UTC (rev 4602)
@@ -7,8 +7,6 @@
### libopenmpt svn
- * xmp-openmpt / in_openmpt: libopenmpt_settings.dll no longer requires
- .NET 4 to be installed.
* foo_openmpt: Settings are now accessable via foobar2000 advanced settings.
* Autotools based build now supports libunmo3. Specify --enable-unmo3.
* Support for dynamic loading of libunmo3 on MacOS X.
@@ -18,6 +16,8 @@
(see `build/vs2008`)
* libopenmpt_ext.hpp is now distributed by default. The API is still
considered experimental and not guaranteed to stay API or ABI compatible.
+ * xmp-openmpt / in_openmpt: No more libopenmpt_settings.dll.
+ The settings dialog now uses a statically linked copy of MFC.
* [Bug] The -autotools tarballs were not working at all.
Modified: trunk/OpenMPT/libopenmpt/in_openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.cpp 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.cpp 2014-11-19 18:09:53 UTC (rev 4602)
@@ -9,6 +9,19 @@
#ifndef NO_WINAMP
+#if defined(_MFC_VER) || 1
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500 // _WIN32_WINNT_WIN2000
+#endif
+#define NOMINMAX
+#include <afxwin.h>
+#include <afxcmn.h>
+#include <windows.h>
+#endif // _MFC_VER
+
#ifdef LIBOPENMPT_BUILD_DLL
#undef LIBOPENMPT_BUILD_DLL
#endif
@@ -30,7 +43,9 @@
static char * in_openmpt_string = "in_openmpt " OPENMPT_API_VERSION_STRING;
#endif
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#include <windows.h>
#define UNICODE_INPUT_PLUGIN
@@ -446,4 +461,22 @@
return &inmod;
}
+
+#ifdef _MFC_VER
+
+void PluginDllMainAttach() {
+ // nothing
+}
+
+void PluginDllMainDetach() {
+ // nothing
+}
+
+#else
+
+// nothing
+
+#endif
+
+
#endif // NO_WINAMP
Modified: trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj 2014-11-19 18:09:53 UTC (rev 4602)
@@ -19,12 +19,14 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -82,6 +84,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="in_openmpt.cpp" />
+ <ClCompile Include="libopenmpt_settings.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libopenmpt.vcxproj">
@@ -90,7 +93,11 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="libopenmpt_settings.hpp" />
+ <ClInclude Include="resource.h" />
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="libopenmpt_settings.rc" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.vcxproj.filters 2014-11-19 18:09:53 UTC (rev 4602)
@@ -18,10 +18,21 @@
<ClCompile Include="in_openmpt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="libopenmpt_settings.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="libopenmpt_settings.hpp">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="libopenmpt_settings.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.sln
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.sln 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.sln 2014-11-19 18:09:53 UTC (rev 4602)
@@ -2,12 +2,7 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt", "libopenmpt.vcxproj", "{812A654D-99BE-4D13-B97F-86332AD3E363}"
- ProjectSection(ProjectDependencies) = postProject
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC} = {B2B6EE07-F662-496D-980C-FCA7CA144DBC}
- EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_settings", "libopenmpt_settings.vcxproj", "{B2B6EE07-F662-496D-980C-FCA7CA144DBC}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmptDLL", "libopenmptDLL.vcxproj", "{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_openmpt", "in_openmpt.vcxproj", "{268A016B-2468-4849-8444-782752F555FC}"
@@ -44,12 +39,6 @@
{812A654D-99BE-4D13-B97F-86332AD3E363}.Release|Win32.Build.0 = Release|Win32
{812A654D-99BE-4D13-B97F-86332AD3E363}.Release|x64.ActiveCfg = Release|x64
{812A654D-99BE-4D13-B97F-86332AD3E363}.Release|x64.Build.0 = Release|x64
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Debug|Win32.ActiveCfg = Debug|Win32
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Debug|Win32.Build.0 = Debug|Win32
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Debug|x64.ActiveCfg = Debug|Win32
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Release|Win32.ActiveCfg = Release|Win32
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Release|Win32.Build.0 = Release|Win32
- {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Release|x64.ActiveCfg = Release|Win32
{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|Win32.ActiveCfg = Debug|Win32
{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|Win32.Build.0 = Debug|Win32
{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|x64.ActiveCfg = Debug|x64
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp 2014-11-19 18:09:53 UTC (rev 4602)
@@ -38,10 +38,12 @@
{
return FALSE;
}
+ PluginDllMainAttach();
return TRUE;
}
virtual int ExitInstance() {
+ PluginDllMainDetach();
return CWinApp::ExitInstance();
}
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_settings.hpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_settings.hpp 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_settings.hpp 2014-11-19 18:09:53 UTC (rev 4602)
@@ -46,6 +46,11 @@
+void PluginDllMainAttach();
+void PluginDllMainDetach();
+
+
+
namespace openmpt { namespace settings {
class settings : public libopenmpt_settings {
@@ -124,37 +129,26 @@
#define LIBOPENMPT_SETTINGS_DECLARE() \
- static HMODULE settings_dll = NULL;
+
#define LIBOPENMPT_SETTINGS_IS_AVAILABLE() \
- settings_dll
+ true
#define LIBOPENMPT_SETTINGS_EDIT( settings, parent, title ) \
do { \
- if ( (libopenmpt_settings_edit_func)GetProcAddress( settings_dll , "libopenmpt_settings_edit" ) ) { \
- ((libopenmpt_settings_edit_func)GetProcAddress( settings_dll, "libopenmpt_settings_edit" ))( settings , parent , title ); \
- } \
+ libopenmpt_settings_edit( settings , parent , title ); \
} while(0)
#define LIBOPENMPT_SETTINGS_UNAVAILABLE( parent, dll, title ) \
- MessageBox( parent , TEXT("libopenmpt_settings.dll failed to load. Please check if it is in the same folder as ") dll TEXT("."), title , MB_ICONERROR )
+ do { \
+ } while(0)
#define LIBOPENMPT_SETTINGS_LOAD() \
do { \
- if ( !settings_dll ) { \
- settings_dll = LoadLibrary( TEXT("libopenmpt_settings.dll") ); \
- } \
- if ( !settings_dll ) { \
- settings_dll = LoadLibrary( TEXT("Plugins\\libopenmpt_settings.dll") ); \
- } \
} while(0)
#define LIBOPENMPT_SETTINGS_UNLOAD() \
do { \
- if ( settings_dll ) { \
- FreeLibrary( settings_dll ); \
- settings_dll = NULL; \
- } \
} while(0)
Deleted: trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj 2014-11-19 18:09:53 UTC (rev 4602)
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B2B6EE07-F662-496D-980C-FCA7CA144DBC}</ProjectGuid>
- <RootNamespace>libopenmpt_settings</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <UseOfMfc>Static</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <UseOfMfc>Static</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- <OutDir>..\bin\$(Platform)-Debug\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- <OutDir>..\bin\$(Platform)\</OutDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <AdditionalOptions>/wd4945 %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalOptions>/wd4945 %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="libopenmpt_settings.cpp">
- <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Async</ExceptionHandling>
- <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Async</ExceptionHandling>
- <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OldStyle</DebugInformationFormat>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
- <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</MinimalRebuild>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="libopenmpt_settings.hpp" />
- <ClInclude Include="resource.h" />
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="libopenmpt_settings.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
Deleted: trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj.filters 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_settings.vcxproj.filters 2014-11-19 18:09:53 UTC (rev 4602)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="libopenmpt_settings.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="libopenmpt_settings.hpp">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="libopenmpt_settings.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file
Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp 2014-11-19 18:09:53 UTC (rev 4602)
@@ -9,6 +9,19 @@
#ifndef NO_XMPLAY
+#if defined(_MFC_VER) || 1
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500 // _WIN32_WINNT_WIN2000
+#endif
+#define NOMINMAX
+#include <afxwin.h>
+#include <afxcmn.h>
+#include <windows.h>
+#endif // _MFC_VER
+
#ifdef LIBOPENMPT_BUILD_DLL
#undef LIBOPENMPT_BUILD_DLL
#endif
@@ -21,7 +34,9 @@
#define LIBOPENMPT_EXT_IS_EXPERIMENTAL
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#include <windows.h>
#include <WindowsX.h>
@@ -1723,6 +1738,19 @@
}; // extern "C"
+
+#ifdef _MFC_VER
+
+void PluginDllMainAttach() {
+ xmp_openmpt_on_dll_load();
+}
+
+void PluginDllMainDetach() {
+ xmp_openmpt_on_dll_unload();
+}
+
+#else
+
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) {
switch ( fdwReason ) {
case DLL_PROCESS_ATTACH:
@@ -1735,4 +1763,7 @@
return TRUE;
}
+#endif
+
+
#endif // NO_XMPLAY
Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj 2014-11-19 18:09:53 UTC (rev 4602)
@@ -19,12 +19,14 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,6 +83,7 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="libopenmpt_settings.cpp" />
<ClCompile Include="xmp-openmpt.cpp" />
</ItemGroup>
<ItemGroup>
@@ -93,7 +96,11 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="libopenmpt_settings.hpp" />
+ <ClInclude Include="resource.h" />
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="libopenmpt_settings.rc" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj.filters 2014-11-19 17:48:59 UTC (rev 4601)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj.filters 2014-11-19 18:09:53 UTC (rev 4602)
@@ -18,10 +18,21 @@
<ClCompile Include="xmp-openmpt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="libopenmpt_settings.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="libopenmpt_settings.hpp">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="libopenmpt_settings.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
