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

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

Revision: 2292
          http://sourceforge.net/p/modplug/code/2292
Author:   manxorist
Date:     2013-06-03 16:11:55 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
[Fix] Always build libmodplug emulation layer against our own copy of the modplug headers instead of accidentally catching up system-wide headers.

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
    trunk/OpenMPT/openmpt123/Makefile

Added Paths:
-----------
    trunk/OpenMPT/include/modplug/
    trunk/OpenMPT/include/modplug/include/
    trunk/OpenMPT/include/modplug/include/libmodplug/

Removed Paths:
-------------
    trunk/OpenMPT/include/libmodplug/

Index: trunk/OpenMPT/include/modplug
===================================================================
--- trunk/OpenMPT/include/modplug	2013-06-03 13:59:03 UTC (rev 2291)
+++ trunk/OpenMPT/include/modplug	2013-06-03 16:11:55 UTC (rev 2292)

Property changes on: trunk/OpenMPT/include/modplug
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: trunk/OpenMPT/include/modplug/include
===================================================================
--- trunk/OpenMPT/include/modplug/include	2013-06-03 13:59:03 UTC (rev 2291)
+++ trunk/OpenMPT/include/modplug/include	2013-06-03 16:11:55 UTC (rev 2292)

Property changes on: trunk/OpenMPT/include/modplug/include
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-06-03 13:59:03 UTC (rev 2291)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-06-03 16:11:55 UTC (rev 2292)
@@ -124,7 +124,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../common;../include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../common/svn_version;../common/svn_version_default;../include;../include/modplug/include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
@@ -164,7 +164,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../common;../include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../common/svn_version;../common/svn_version_default;../include;../include/modplug/include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
@@ -205,7 +205,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../common/svn_version;../common/svn_version_default;../include;../include/modplug/include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -267,7 +267,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../common/svn_version;../common/svn_version_default;../include;../include/modplug/include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile	2013-06-03 13:59:03 UTC (rev 2291)
+++ trunk/OpenMPT/openmpt123/Makefile	2013-06-03 16:11:55 UTC (rev 2292)
@@ -32,7 +32,7 @@
 DYNLINK = 1
 
 
-CPPFLAGS = -I../common -I.. 
+CPPFLAGS = -I../common -I.. -I../include/modplug/include
 CXXFLAGS = -std=c++0x -O3 -fPIC -fvisibility=hidden -fno-strict-aliasing -ffast-math -Wall -Wextra -Wcast-align
 CFLAGS   = -std=c99   -O3 -fPIC -fvisibility=hidden -fno-strict-aliasing -ffast-math -Wall -Wextra -Wcast-align
 LDFLAGS  = 
@@ -144,8 +144,12 @@
 
 -include $(ALL_DEPENDS)
 
-OUTPUTS = bin/openmpt123 bin/modplug123 bin/libopenmpt.so bin/openmpt.a
-#OUTPUTS += lib/libopenmpt_modplug.so
+OUTPUTS += bin/libopenmpt.so
+OUTPUTS += bin/openmpt.a
+OUTPUTS += bin/openmpt123
+#OUTPUTS += bin/libopenmpt_modplug.so
+#OUTPUTS += bin/modplug123
+
 all: $(OUTPUTS)
 
 bin/libopenmpt.so: $(LIBOPENMPT_OBJECTS)

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