mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-26 10:15:48 +00:00
Code Issues Projects Releases Wiki Activity

OSX #define fixes, start of standalone SDL version

Browse Source
This commit is contained in:
Mischa S
2015-06-02 21:28:28 -07:00
parent f354263764
commit 43239c2e5d
6 changed files with 8 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -10,6 +10,7 @@ OPTION(INCLUDE-PROJECTM-JACK "Build the projectM JACK client" OFF)
OPTION(INCLUDE-PROJECTM-TEST "Build the projectM test suite" ON)
OPTION(INCLUDE-PROJECTM-EMSCRIPTEN "Build projectM for the web (emscripten)" OFF)
OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated, use audacious instead)" OFF)
OPTION(INCLUDE-PROJECTM-SDL "Build the projectM SDL application" OFF)
OPTION(INCLUDE-NATIVE-PRESETS "Build the projectM native preset sample collection " ON)
set(PROJECTM_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@ -63,9 +64,13 @@ if (INCLUDE-PROJECTM-LIBVISUAL)
endif (INCLUDE-PROJECTM-LIBVISUAL)
if (INCLUDE-PROJECTM-LIBVISUAL-ALSA)
add_subdirectory (projectM-libvisual-alsa)
add_subdirectory (projectM-libvisual-alsa)
endif (INCLUDE-PROJECTM-LIBVISUAL-ALSA)
if (INCLUDE-PROJECTM-SDL)
add_subdirectory (projectM-sdl)
endif (INCLUDE-PROJECTM-SDL)
if (INCLUDE-NATIVE-PRESETS)
add_subdirectory(NativePresets)
endif (INCLUDE-NATIVE-PRESETS)

2
src/libprojectM/PresetLoader.hpp
View File

@ -17,7 +17,7 @@
#include <dirent.h>
#endif
#ifdef MACOS
#ifdef __APPLE__
#include <dirent.h>
#endif

2
src/libprojectM/Renderer/FBO.hpp
View File

@ -41,7 +41,7 @@
#endif
#endif
#ifdef MACOS
#ifdef __APPLE__
#include <OpenGL/gl.h>
#endif /** MACOS */

242
src/projectM-sdl/projectM-sdl.xcodeproj/project.pbxproj
View File

@ -1,242 +0,0 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
C39C82631B1EB5FD0026DFA0 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C39C82621B1EB5FD0026DFA0 /* main.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
C39C825D1B1EB5FD0026DFA0 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
C39C825F1B1EB5FD0026DFA0 /* projectM-sdl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "projectM-sdl"; sourceTree = BUILT_PRODUCTS_DIR; };
C39C82621B1EB5FD0026DFA0 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
C39C825C1B1EB5FD0026DFA0 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
C39C82561B1EB5FD0026DFA0 = {
isa = PBXGroup;
children = (
C39C82611B1EB5FD0026DFA0 /* projectM-sdl */,
C39C82601B1EB5FD0026DFA0 /* Products */,
);
sourceTree = "<group>";
};
C39C82601B1EB5FD0026DFA0 /* Products */ = {
isa = PBXGroup;
children = (
C39C825F1B1EB5FD0026DFA0 /* projectM-sdl */,
);
name = Products;
sourceTree = "<group>";
};
C39C82611B1EB5FD0026DFA0 /* projectM-sdl */ = {
isa = PBXGroup;
children = (
C39C82621B1EB5FD0026DFA0 /* main.cpp */,
);
path = "projectM-sdl";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
C39C825E1B1EB5FD0026DFA0 /* projectM-sdl */ = {
isa = PBXNativeTarget;
buildConfigurationList = C39C82661B1EB5FD0026DFA0 /* Build configuration list for PBXNativeTarget "projectM-sdl" */;
buildPhases = (
C39C825B1B1EB5FD0026DFA0 /* Sources */,
C39C825C1B1EB5FD0026DFA0 /* Frameworks */,
C39C825D1B1EB5FD0026DFA0 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = "projectM-sdl";
productName = "projectM-sdl";
productReference = C39C825F1B1EB5FD0026DFA0 /* projectM-sdl */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
C39C82571B1EB5FD0026DFA0 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
ORGANIZATIONNAME = int80;
TargetAttributes = {
C39C825E1B1EB5FD0026DFA0 = {
CreatedOnToolsVersion = 6.3.2;
};
};
};
buildConfigurationList = C39C825A1B1EB5FD0026DFA0 /* Build configuration list for PBXProject "projectM-sdl" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = C39C82561B1EB5FD0026DFA0;
productRefGroup = C39C82601B1EB5FD0026DFA0 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
C39C825E1B1EB5FD0026DFA0 /* projectM-sdl */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
C39C825B1B1EB5FD0026DFA0 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C39C82631B1EB5FD0026DFA0 /* main.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
C39C82641B1EB5FD0026DFA0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Debug;
};
C39C82651B1EB5FD0026DFA0 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
name = Release;
};
C39C82671B1EB5FD0026DFA0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
C39C82681B1EB5FD0026DFA0 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
C39C825A1B1EB5FD0026DFA0 /* Build configuration list for PBXProject "projectM-sdl" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C39C82641B1EB5FD0026DFA0 /* Debug */,
C39C82651B1EB5FD0026DFA0 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C39C82661B1EB5FD0026DFA0 /* Build configuration list for PBXNativeTarget "projectM-sdl" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C39C82671B1EB5FD0026DFA0 /* Debug */,
C39C82681B1EB5FD0026DFA0 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */
};
rootObject = C39C82571B1EB5FD0026DFA0 /* Project object */;
}

7
src/projectM-sdl/projectM-sdl.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:projectM-sdl.xcodeproj">
</FileRef>
</Workspace>

17
src/projectM-sdl/projectM-sdl/main.cpp
View File

@ -1,17 +0,0 @@
//
// main.cpp
// projectM-sdl
//
// Created by Mischa Spiegelmock on 6/3/15.
// Copyright (c) 2015 Mischa Spiegelmock. All rights reserved.
//
// This is an implementation of projectM using libsdl2
#include <iostream>
int main(int argc, const char * argv[]) {
// insert code here...
std::cout << "Hello, World!\n";
return 0;
}