Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 86c0600

Browse files
OSX demo with SDL working better
1 parent c26ee1f commit 86c0600

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

‎src/projectM-emscripten/emprojectM.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
C34E81051956B633001AC5B5 /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81041956B633001AC5B5 /* libRenderer.a */; };
11+
C34E81071956B7BF001AC5B5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81061956B7BF001AC5B5 /* CoreFoundation.framework */; };
12+
C34E81091956B7D3001AC5B5 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81081956B7D3001AC5B5 /* libNativePresetFactory.a */; };
13+
C34E810B1956B7D9001AC5B5 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E810A1956B7D9001AC5B5 /* libMilkdropPresetFactory.a */; };
14+
C34E810D1956B832001AC5B5 /* presets in CopyFiles */ = {isa = PBXBuildFile; fileRef = C34E810C1956B821001AC5B5 /* presets */; };
1015
C3F90686195670EF00C8DF0F /* projectM_SDL_emscripten.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3F90685195670EF00C8DF0F /* projectM_SDL_emscripten.cpp */; };
1116
C3F9068A195676C500C8DF0F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F90689195676C500C8DF0F /* OpenGL.framework */; };
1217
C3F9068C195676CC00C8DF0F /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9068B195676CC00C8DF0F /* GLUT.framework */; };
@@ -18,14 +23,20 @@
1823
isa = PBXCopyFilesBuildPhase;
1924
buildActionMask = 12;
2025
dstPath = "";
21-
dstSubfolderSpec = 10;
26+
dstSubfolderSpec = 16;
2227
files = (
28+
C34E810D1956B832001AC5B5 /* presets in CopyFiles */,
2329
);
2430
runOnlyForDeploymentPostprocessing = 0;
2531
};
2632
/* End PBXCopyFilesBuildPhase section */
2733

2834
/* Begin PBXFileReference section */
35+
C34E81041956B633001AC5B5 /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/libRenderer.a; sourceTree = "<group>"; };
36+
C34E81061956B7BF001AC5B5 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
37+
C34E81081956B7D3001AC5B5 /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/libNativePresetFactory.a; sourceTree = "<group>"; };
38+
C34E810A1956B7D9001AC5B5 /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.a; sourceTree = "<group>"; };
39+
C34E810C1956B821001AC5B5 /* presets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets; path = build/presets; sourceTree = SOURCE_ROOT; };
2940
C3F90678195670BC00C8DF0F /* emprojectM */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = emprojectM; sourceTree = BUILT_PRODUCTS_DIR; };
3041
C3F90685195670EF00C8DF0F /* projectM_SDL_emscripten.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projectM_SDL_emscripten.cpp; sourceTree = SOURCE_ROOT; };
3142
C3F90689195676C500C8DF0F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
@@ -38,8 +49,12 @@
3849
isa = PBXFrameworksBuildPhase;
3950
buildActionMask = 2147483647;
4051
files = (
52+
C34E81071956B7BF001AC5B5 /* CoreFoundation.framework in Frameworks */,
53+
C34E810B1956B7D9001AC5B5 /* libMilkdropPresetFactory.a in Frameworks */,
4154
C3F9069019567A4600C8DF0F /* libprojectM.a in Frameworks */,
4255
C3F9068C195676CC00C8DF0F /* GLUT.framework in Frameworks */,
56+
C34E81051956B633001AC5B5 /* libRenderer.a in Frameworks */,
57+
C34E81091956B7D3001AC5B5 /* libNativePresetFactory.a in Frameworks */,
4358
C3F9068A195676C500C8DF0F /* OpenGL.framework in Frameworks */,
4459
);
4560
runOnlyForDeploymentPostprocessing = 0;
@@ -50,6 +65,10 @@
5065
C3F9066F195670BC00C8DF0F = {
5166
isa = PBXGroup;
5267
children = (
68+
C34E810A1956B7D9001AC5B5 /* libMilkdropPresetFactory.a */,
69+
C34E81081956B7D3001AC5B5 /* libNativePresetFactory.a */,
70+
C34E81061956B7BF001AC5B5 /* CoreFoundation.framework */,
71+
C34E81041956B633001AC5B5 /* libRenderer.a */,
5372
C3F9068F19567A4600C8DF0F /* libprojectM.a */,
5473
C3F9068B195676CC00C8DF0F /* GLUT.framework */,
5574
C3F90689195676C500C8DF0F /* OpenGL.framework */,
@@ -69,6 +88,7 @@
6988
C3F9067A195670BC00C8DF0F /* emprojectM */ = {
7089
isa = PBXGroup;
7190
children = (
91+
C34E810C1956B821001AC5B5 /* presets */,
7292
C3F90685195670EF00C8DF0F /* projectM_SDL_emscripten.cpp */,
7393
);
7494
path = emprojectM;
@@ -229,6 +249,9 @@
229249
LIBRARY_SEARCH_PATHS = (
230250
"$(inherited)",
231251
/Users/snooz/dev/projectm/src/libprojectM,
252+
/Users/snooz/dev/projectm/src/libprojectM/Renderer,
253+
/Users/snooz/dev/projectm/src/libprojectM/NativePresetFactory,
254+
/Users/snooz/dev/projectm/src/libprojectM/MilkdropPresetFactory,
232255
);
233256
OTHER_LDFLAGS = (
234257
"-lSDL2",
@@ -255,6 +278,9 @@
255278
LIBRARY_SEARCH_PATHS = (
256279
"$(inherited)",
257280
/Users/snooz/dev/projectm/src/libprojectM,
281+
/Users/snooz/dev/projectm/src/libprojectM/Renderer,
282+
/Users/snooz/dev/projectm/src/libprojectM/NativePresetFactory,
283+
/Users/snooz/dev/projectm/src/libprojectM/MilkdropPresetFactory,
258284
);
259285
OTHER_LDFLAGS = (
260286
"-lSDL2",

‎src/projectM-emscripten/projectM_SDL_emscripten.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,25 @@ int main( int argc, char *argv[] ) {
136136
}
137137
#endif
138138

139-
settings.meshX = 2;
140-
settings.meshY = 2;
139+
settings.meshX = 1;
140+
settings.meshY = 1;
141141
settings.fps = FPS;
142142
settings.textureSize = 2048; // idk?
143143
settings.windowWidth = width;
144144
settings.windowHeight = height;
145-
settings.presetURL = "http://./presets";
146145
settings.smoothPresetDuration = 3; // seconds
147146
settings.presetDuration = 5; // seconds
148147
settings.beatSensitivity = 0.8;
149148
settings.aspectCorrection = 1;
150149
settings.easterEgg = 0; // ???
151150
settings.shuffleEnabled = 1;
152151
settings.softCutRatingsEnabled = 1; // ???
153-
152+
#ifdef EMSCRIPTEN
153+
settings.presetURL = "http://./presets";
154+
#else
155+
settings.presetURL = "presets";
156+
#endif
157+
154158
// init projectM
155159
printf("initting\n");
156160
globalPM = new projectM(settings);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /