summaryrefslogtreecommitdiff
path: root/sid
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2009-09-13 10:13:43 +0200
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2009-09-13 10:13:43 +0200
commit9af0aa32c1e32e7ac841c624e0c4f383430e2efd (patch)
treea281840577f9732c843bb63e844cf3cda5e46580 /sid
parentea5dabc28a719e57b59ea0852f89cb0002caa43b (diff)
desktop icons, launcher update, minor libsidplay2 patches
Diffstat (limited to 'sid')
-rw-r--r--sid/sidplay-libs-2.1.0/Makefile.am2
-rw-r--r--sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h8
-rw-r--r--sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h8
3 files changed, 3 insertions, 15 deletions
diff --git a/sid/sidplay-libs-2.1.0/Makefile.am b/sid/sidplay-libs-2.1.0/Makefile.am
index 9e52270e..8466cefb 100644
--- a/sid/sidplay-libs-2.1.0/Makefile.am
+++ b/sid/sidplay-libs-2.1.0/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = \
$(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\
$(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS
-AM_CPPFLAGS = $(CPPFLAGS) -DVERSION=\"2.1.0\" -DHAVE_STRNCASECMP -DHAVE_STRCASECMP -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include
+AM_CPPFLAGS = $(CPPFLAGS) -DHAVEUNIX -DVERSION=\"2.1.0\" -DHAVE_STRNCASECMP -DHAVE_STRCASECMP -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include
libsidplay2_a_SOURCES = \
libsidplay/src/mixer.cpp\
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
index fa8af23e..f158dc9a 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidconfig.h
@@ -24,10 +24,4 @@
*
***************************************************************************/
-#if defined(HAVE_UNIX)
-# include "../../unix/sidconfig.h"
-#elif defined(HAVE_MSWINDOWS)
-# include "../../win/VC/sidconfig.h"
-#else
-# error Platform not supported!
-#endif
+#include "../../unix/sidconfig.h"
diff --git a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
index c2387d78..7f26ccea 100644
--- a/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
+++ b/sid/sidplay-libs-2.1.0/libsidplay/include/sidplay/sidint.h
@@ -15,10 +15,4 @@
* *
***************************************************************************/
-#if defined(HAVE_UNIX)
-# include "../../unix/sidint.h"
-#elif defined(HAVE_MSWINDOWS)
-# include "../../win/VC/sidint.h"
-#else
-# error Platform not supported!
-#endif
+#include "../../unix/sidint.h"