From b3c3282eb00fae210e9499fa9d11bcfcccffbd96 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sat, 20 Feb 2021 21:40:39 +0200 Subject: [PATCH] Do away with Intrinsics.h --- configure.ac | 2 +- src/libprojectM/Common.hpp | 2 -- src/libprojectM/Intrinsics.h | 16 ---------------- src/libprojectM/Makefile.am | 2 +- .../MilkdropPresetFactory/MilkdropPreset.cpp | 4 ++-- src/libprojectM/MilkdropPresetFactory/Param.hpp | 2 +- .../MilkdropPresetFactory/PresetFrameIO.cpp | 6 +++--- .../MilkdropPresetFactory/PresetFrameIO.hpp | 2 +- .../SDLprojectM.xcodeproj/project.pbxproj | 5 +++-- 9 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 src/libprojectM/Intrinsics.h diff --git a/configure.ac b/configure.ac index e8625e5bf..a62e8dfc5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([projectM], [3.1.11], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/]) +AC_INIT([projectM], [3.1.12], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax]) AX_IS_RELEASE([git-directory]) diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp index e1b9a2534..d3405bab8 100755 --- a/src/libprojectM/Common.hpp +++ b/src/libprojectM/Common.hpp @@ -31,8 +31,6 @@ #include #include -#include "Intrinsics.h" - #ifdef _MSC_VER #define strcasecmp(s, t) _strcmpi(s, t) #endif diff --git a/src/libprojectM/Intrinsics.h b/src/libprojectM/Intrinsics.h deleted file mode 100644 index f504e04e5..000000000 --- a/src/libprojectM/Intrinsics.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// Intrinsics.h -// libprojectM -// -// Created by Mischa Spiegelmock on 2/13/21. -// - -#ifndef PRJMIntrinsics_h -#define PRJMIntrinsics_h - -// try to detect if we have SSE2 (intel only) -#ifdef __SSE2__ -#define _HAS_SSE2_ 1 -#endif - -#endif /* PRJMIntrinsics_h */ diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am index b534f7202..8c72b1c68 100644 --- a/src/libprojectM/Makefile.am +++ b/src/libprojectM/Makefile.am @@ -29,7 +29,7 @@ libprojectM_la_SOURCES = ConfigFile.cpp Preset.cpp PresetLoader.cpp timer.cpp \ HungarianMethod.hpp Preset.hpp RandomNumberGenerators.hpp\ IdleTextures.hpp PresetChooser.hpp TimeKeeper.hpp\ KeyHandler.hpp PresetFactory.hpp projectM.hpp\ - BackgroundWorker.h Intrinsics.h \ + BackgroundWorker.h \ PCM.hpp PresetFactoryManager.hpp\ projectM.hpp projectM-opengl.h \ ConfigFile.h \ diff --git a/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp index d3239878b..fce094234 100755 --- a/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp +++ b/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp @@ -44,7 +44,7 @@ #include "PresetFactoryManager.hpp" #include "MilkdropPresetFactory.hpp" -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ #include #endif @@ -391,7 +391,7 @@ void MilkdropPreset::evaluateFrame() } -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ inline void init_mesh(float **mesh, const float value, const int gx, const int gy) { __m128 mvalue = _mm_set_ps1(value); diff --git a/src/libprojectM/MilkdropPresetFactory/Param.hpp b/src/libprojectM/MilkdropPresetFactory/Param.hpp index aef9b86b4..92823329a 100755 --- a/src/libprojectM/MilkdropPresetFactory/Param.hpp +++ b/src/libprojectM/MilkdropPresetFactory/Param.hpp @@ -60,7 +60,7 @@ class Preset; class Test; -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ #include #endif diff --git a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp index 5b022252a..79d1ac37b 100644 --- a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp +++ b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp @@ -6,7 +6,7 @@ #include #include "Renderer/BeatDetect.hpp" -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ #include #endif @@ -235,7 +235,7 @@ void PresetOutputs::PerPixelMath_c(const PipelineContext &context) } -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ // is there an SSE way to do this? inline __m128 _mm_pow(__m128 x, __m128 y) @@ -448,7 +448,7 @@ void PresetOutputs::PerPixelMath_sse(const PipelineContext &context) void PresetOutputs::PerPixelMath(const PipelineContext &context) { -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ PerPixelMath_sse(context); #else PerPixelMath_c(context); diff --git a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp index e952073ce..d9bc4ddf4 100644 --- a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp +++ b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp @@ -141,7 +141,7 @@ public: private: void PerPixelMath_c( const PipelineContext &context); -#ifdef _HAS_SSE2_ +#ifdef __SSE2__ void PerPixelMath_sse( const PipelineContext &context); #endif }; diff --git a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj index b602fa1a7..47d1f60f5 100644 --- a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj +++ b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj @@ -543,6 +543,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; + OTHER_LDFLAGS = "-lSDL2"; }; name = Debug; }; @@ -588,7 +589,9 @@ LIBRARY_SEARCH_PATHS = /usr/local/lib; MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; + OTHER_LDFLAGS = "-lSDL2"; }; name = Release; }; @@ -604,7 +607,6 @@ INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist"; LIBRARY_SEARCH_PATHS = /usr/local/lib; MARKETING_VERSION = 3.1.11; - OTHER_LDFLAGS = "-lSDL2"; PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -624,7 +626,6 @@ INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist"; LIBRARY_SEARCH_PATHS = /usr/local/lib; MARKETING_VERSION = 3.1.11; - OTHER_LDFLAGS = "-lSDL2"; PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";