Skip to content

Commit ba26684

Browse files
revmischarevmischa
committed
experimenting with osx/Cg
1 parent 5543db1 commit ba26684

File tree

5 files changed

+36
-7
lines changed

5 files changed

+36
-7
lines changed

‎src/libprojectM/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ if (APPLE)
5656
SET(USE_OPENMP OFF)
5757
SET(BUILD_PROJECTM_STATIC ON)
5858
SET(USE_FBO ON)
59+
SET(USE_CG ON)
5960
endif(APPLE)
6061

6162
ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")

‎src/libprojectM/MilkdropPresetFactory/Parser.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#ifndef _PARSER_H
3030
#define _PARSER_H
3131
//#define PARSE_DEBUG 2
32-
#define PARSE_DEBUG 0
32+
#define PARSE_DEBUG 1
3333

3434
#include <stdio.h>
3535

‎src/libprojectM/PresetLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ std::auto_ptr<Preset> PresetLoader::loadPreset ( unsigned int index ) const
144144

145145
std::auto_ptr<Preset> PresetLoader::loadPreset ( const std::string & url ) const
146146
{
147-
147+
std::cout << "Loading preset " << url << std::endl;
148148

149149
try {
150150
/// @bug probably should not use url for preset name

‎src/projectM-iTunes/config.inp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
# Configuration File for projectM
33

44
Texture Size = 2048 # Size of internal rendering texture
5-
Mesh X = 16 # Width of PerPixel Equation mesh
6-
Mesh Y = 9 # Height of PerPixel Equation mesh
5+
Mesh X = 64 # Width of PerPixel Equation mesh
6+
Mesh Y = 36 # Height of PerPixel Equation mesh
77
FPS = 60 # Frames Per Second
88
Fullscreen = false
99
Window Width = 1920 # startup window width
1010
Window Height = 1280 # startup window height
1111

1212
Smooth Transition Duration = 5 # in seconds
1313
Preset Duration = 20 # in seconds
14-
Easter Egg Parameter = 0
14+
Easter Egg Parameter = .1
1515

1616
Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent
1717
Aspect Correction = true # Custom Shape Aspect Correction

‎src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81211956D0D9001AC5B5 /* libfreetype.a */; };
1717
C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81231956D0DA001AC5B5 /* libbz2.a */; };
1818
C37822041956D90D0058A694 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3FAE59C17B88BF800F4B110 /* libprojectM.a */; };
19+
C3C244321957646D0021FCD4 /* Cg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3C244311957646D0021FCD4 /* Cg.framework */; };
20+
C3C24433195764780021FCD4 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C244311957646D0021FCD4 /* Cg.framework */; };
21+
C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C24434195764870021FCD4 /* libGLEW.a */; };
1922
C3F9D7B317B82CC3009E58CB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7B217B82CC3009E58CB /* Cocoa.framework */; };
2023
C3F9D7CF17B831F3009E58CB /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7CE17B831F3009E58CB /* OpenGL.framework */; };
2124
C3F9D7D317B83CCB009E58CB /* iprojectM_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C3F9D7D017B83CCB009E58CB /* iprojectM_mac.mm */; };
@@ -30,6 +33,16 @@
3033
/* End PBXBuildFile section */
3134

3235
/* Begin PBXCopyFilesBuildPhase section */
36+
C3C24430195764660021FCD4 /* CopyFiles */ = {
37+
isa = PBXCopyFilesBuildPhase;
38+
buildActionMask = 2147483647;
39+
dstPath = "";
40+
dstSubfolderSpec = 10;
41+
files = (
42+
C3C244321957646D0021FCD4 /* Cg.framework in CopyFiles */,
43+
);
44+
runOnlyForDeploymentPostprocessing = 0;
45+
};
3346
C3FAE5A917B898BB00F4B110 /* plist */ = {
3447
isa = PBXCopyFilesBuildPhase;
3548
buildActionMask = 2147483647;
@@ -71,6 +84,8 @@
7184
C34E81231956D0DA001AC5B5 /* libbz2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbz2.a; path = macos/contrib/libbz2.a; sourceTree = "<group>"; };
7285
C37821FF1956D82A0058A694 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; };
7386
C37822011956D8B30058A694 /* libprojectM.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libprojectM.2.dylib; path = ../libprojectM/libprojectM.2.dylib; sourceTree = "<group>"; };
87+
C3C244311957646D0021FCD4 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = macos/contrib/Cg.framework; sourceTree = "<group>"; };
88+
C3C24434195764870021FCD4 /* libGLEW.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGLEW.a; path = macos/contrib/libGLEW.a; sourceTree = "<group>"; };
7489
C3F9D7AF17B82CC3009E58CB /* iProjectM.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iProjectM.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
7590
C3F9D7B217B82CC3009E58CB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
7691
C3F9D7B517B82CC3009E58CB /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -105,6 +120,8 @@
105120
isa = PBXFrameworksBuildPhase;
106121
buildActionMask = 2147483647;
107122
files = (
123+
C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */,
124+
C3C24433195764780021FCD4 /* Cg.framework in Frameworks */,
108125
C37822041956D90D0058A694 /* libprojectM.a in Frameworks */,
109126
C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */,
110127
C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */,
@@ -125,6 +142,7 @@
125142
C3F9D7A617B82CC3009E58CB = {
126143
isa = PBXGroup;
127144
children = (
145+
C3C244311957646D0021FCD4 /* Cg.framework */,
128146
C34E81191956D0C3001AC5B5 /* contrib */,
129147
C3FAF97A17B8A44100F4B110 /* share */,
130148
C3FAE5A417B88C5B00F4B110 /* libprojectM */,
@@ -151,6 +169,7 @@
151169
C3F9D7B117B82CC3009E58CB /* Frameworks */ = {
152170
isa = PBXGroup;
153171
children = (
172+
C3C24434195764870021FCD4 /* libGLEW.a */,
154173
C37822011956D8B30058A694 /* libprojectM.2.dylib */,
155174
C37821FF1956D82A0058A694 /* libc++.1.dylib */,
156175
C34E81231956D0DA001AC5B5 /* libbz2.a */,
@@ -243,6 +262,7 @@
243262
C3F9D7AB17B82CC3009E58CB /* Sources */,
244263
C3F9D7AC17B82CC3009E58CB /* Frameworks */,
245264
C3FAE5A917B898BB00F4B110 /* plist */,
265+
C3C24430195764660021FCD4 /* CopyFiles */,
246266
C3FAF97317B89F1700F4B110 /* share */,
247267
C3FAE5AB17B898F800F4B110 /* Generate Installer Package */,
248268
);
@@ -325,7 +345,7 @@
325345
CLANG_WARN_ENUM_CONVERSION = YES;
326346
CLANG_WARN_INT_CONVERSION = YES;
327347
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
328-
CODE_SIGN_IDENTITY = "Mac Developer: Sean Cottrell (4GNZ4Z332S)";
348+
CODE_SIGN_IDENTITY = "";
329349
COPY_PHASE_STRIP = NO;
330350
DEPLOYMENT_LOCATION = YES;
331351
DYLIB_CURRENT_VERSION = 1.0.0;
@@ -365,7 +385,7 @@
365385
CLANG_WARN_ENUM_CONVERSION = YES;
366386
CLANG_WARN_INT_CONVERSION = YES;
367387
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
368-
CODE_SIGN_IDENTITY = "Mac Developer: Sean Cottrell (4GNZ4Z332S)";
388+
CODE_SIGN_IDENTITY = "";
369389
COPY_PHASE_STRIP = YES;
370390
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
371391
DEPLOYMENT_LOCATION = YES;
@@ -391,6 +411,10 @@
391411
isa = XCBuildConfiguration;
392412
buildSettings = {
393413
COMBINE_HIDPI_IMAGES = YES;
414+
FRAMEWORK_SEARCH_PATHS = (
415+
"$(inherited)",
416+
"$(PROJECT_DIR)/macos/contrib",
417+
);
394418
GCC_PRECOMPILE_PREFIX_HEADER = NO;
395419
GENERATE_PKGINFO_FILE = YES;
396420
INFOPLIST_FILE = "iProjectM/iProjectM-Info.plist";
@@ -420,6 +444,10 @@
420444
isa = XCBuildConfiguration;
421445
buildSettings = {
422446
COMBINE_HIDPI_IMAGES = YES;
447+
FRAMEWORK_SEARCH_PATHS = (
448+
"$(inherited)",
449+
"$(PROJECT_DIR)/macos/contrib",
450+
);
423451
GCC_PRECOMPILE_PREFIX_HEADER = NO;
424452
GENERATE_PKGINFO_FILE = YES;
425453
INFOPLIST_FILE = "iProjectM/iProjectM-Info.plist";

0 commit comments

Comments
 (0)