Skip to content

Commit 0758b04

Browse files
author
Mischa Spiegelmock
committed
add preset name to window title, add mac build debug Make target with xcodebuild
1 parent 571516b commit 0758b04

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

Makefile.am

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ src/libprojectM/config.inp: src/libprojectM/config.inp.in Makefile
3636
chmod a-w $@.tmp && \
3737
mv $@.tmp $@
3838

39+
macOS/Build/Products/Debug/presets:
40+
mkdir -p macOS/Build/Products/Debug
41+
ln -s $(PWD)/presets macOS/Build/Products/Debug/
42+
43+
build-mac: macOS/Build/Products/Debug/presets
44+
xcrun xcodebuild -scheme "projectM SDL" -configuration Debug -derivedDataPath macOS
45+
@echo "Products built in macOS/Build/Products/Debug"
46+
open macOS/Build/Products/Debug
47+
3948
# do a macOS build
4049
dist-mac: dist
4150
rm -rf dist

src/libprojectM/libprojectM.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
1612CA3A207B9ED500862A3A /* InitCond.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA26207B9ED500862A3A /* InitCond.hpp */; };
6464
1612CA3B207B9ED500862A3A /* Param.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA27207B9ED500862A3A /* Param.hpp */; };
6565
1612CA3C207B9ED500862A3A /* ParamUtils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA28207B9ED500862A3A /* ParamUtils.hpp */; };
66+
1657E01023DF788F00B25D5C /* projectM.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1657E00F23DF788F00B25D5C /* projectM.hpp */; };
6667
166854422105E4EC0042793A /* etc1_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E4207A85DC00862A3A /* etc1_utils.c */; };
6768
166854432105E4EF0042793A /* image_DXT.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E6207A85DC00862A3A /* image_DXT.c */; };
6869
166854442105E4FC0042793A /* image_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E7207A85DC00862A3A /* image_helper.c */; };
@@ -220,6 +221,7 @@
220221
16178AC5207A68A600D3B0C8 /* KeyHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyHandler.cpp; sourceTree = "<group>"; };
221222
16178AF7207A691100D3B0C8 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
222223
16178B12207A6F4000D3B0C8 /* libRenderer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRenderer.a; sourceTree = BUILT_PRODUCTS_DIR; };
224+
1657E00F23DF788F00B25D5C /* projectM.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = projectM.hpp; sourceTree = "<group>"; };
223225
1668541B2105E4BC0042793A /* PerlinNoise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerlinNoise.cpp; path = Renderer/PerlinNoise.cpp; sourceTree = "<group>"; };
224226
1668541C2105E4BC0042793A /* RenderItemMatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RenderItemMatcher.cpp; path = Renderer/RenderItemMatcher.cpp; sourceTree = "<group>"; };
225227
1668541D2105E4BC0042793A /* VideoEcho.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoEcho.cpp; path = Renderer/VideoEcho.cpp; sourceTree = "<group>"; };
@@ -352,6 +354,7 @@
352354
1612C9ED207A877D00862A3A /* Headers */ = {
353355
isa = PBXGroup;
354356
children = (
357+
1657E00F23DF788F00B25D5C /* projectM.hpp */,
355358
1612C9FC207A878800862A3A /* carbontoprojectM.h */,
356359
1612C9EF207A878800862A3A /* cocoatoprojectM.h */,
357360
1612C9F4207A878800862A3A /* ConfigFile.h */,
@@ -586,6 +589,7 @@
586589
1612CA09207A878900862A3A /* fftsg.h in Headers */,
587590
1612CA0E207A878900862A3A /* projectM-opengl.h in Headers */,
588591
1612CA0B207A878900862A3A /* glxew.h in Headers */,
592+
1657E01023DF788F00B25D5C /* projectM.hpp in Headers */,
589593
1612CA0D207A878900862A3A /* carbontoprojectM.h in Headers */,
590594
);
591595
runOnlyForDeploymentPostprocessing = 0;

src/projectM-sdl/pmSDL.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,4 +555,7 @@ void projectMSDL::renderTexture() {
555555
void projectMSDL::presetSwitchedEvent(bool isHardCut, size_t index) const {
556556
std::string presetName = getPresetName(index);
557557
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Displaying preset: %s\n", presetName.c_str());
558+
559+
std::string newTitle = "projectM ➫ " + presetName;
560+
SDL_SetWindowTitle(win, newTitle.c_str());
558561
}

0 commit comments

Comments
 (0)