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

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

Revision: 3793
          http://sourceforge.net/p/modplug/code/3793
Author:   manxorist
Date:     2014-02-28 13:22:16 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
[Ref] build: Emscripten already defines __EMSCRIPTEN__, no need to invent MPT_EMSCRIPTEN.

Modified Paths:
--------------
    trunk/OpenMPT/build/make/Makefile.config.emscripten
    trunk/OpenMPT/libopenmpt/libopenmpt_config.h

Modified: trunk/OpenMPT/build/make/Makefile.config.emscripten
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.emscripten	2014-02-28 13:12:54 UTC (rev 3792)
+++ trunk/OpenMPT/build/make/Makefile.config.emscripten	2014-02-28 13:22:16 UTC (rev 3793)
@@ -4,7 +4,7 @@
 LD  = em++
 AR  = emar
 
-CPPFLAGS += -DMPT_EMSCRIPTEN -DMPT_CHARSET_CPP -DMPT_CHARSET_ASSUME_UTF8_LOCALE
+CPPFLAGS += -DMPT_CHARSET_CPP -DMPT_CHARSET_ASSUME_UTF8_LOCALE
 CXXFLAGS += -std=c++0x -fPIC 
 CFLAGS   += -std=c99   -fPIC
 LDFLAGS  += -O2 -s DISABLE_EXCEPTION_CATCHING=0 

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_config.h
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_config.h	2014-02-28 13:12:54 UTC (rev 3792)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_config.h	2014-02-28 13:22:16 UTC (rev 3793)
@@ -38,7 +38,7 @@
 
 #elif defined(__GNUC__) || defined(__clang__)
 
-#if !defined(MPT_EMSCRIPTEN)
+#if !defined(__EMSCRIPTEN__)
 #if defined(_WIN32)
 #define LIBOPENMPT_API_HELPER_EXPORT __declspec(dllexport)
 #define LIBOPENMPT_API_HELPER_IMPORT __declspec(dllimport)
@@ -82,7 +82,8 @@
 #endif
 #endif
 
-#if defined(MPT_EMSCRIPTEN)
+#if defined(__EMSCRIPTEN__)
+
 /* Only the C API is supported for emscripten. Disable the C++ API. */
 #undef LIBOPENMPT_CXX_API
 #define LIBOPENMPT_CXX_API LIBOPENMPT_API_HELPER_LOCAL 

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