Skip to content

Commit

Permalink
Removed glfw platform hint and added aditional dyld path
Browse files Browse the repository at this point in the history
  • Loading branch information
bmcdorman committed Oct 23, 2012
1 parent b9eab3a commit f5cdbc1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rc/platform.hints
@@ -1,7 +1,7 @@
[General] [General]
C_FLAGS = -std=c99 -Wall -I${PREFIX}/usr/include -include stdio.h -include kiss/kiss.h -include blobtastic/blobtastic.h -include target.h -g C_FLAGS = -std=c99 -Wall -I${PREFIX}/usr/include -include stdio.h -include kiss/kiss.h -include blobtastic/blobtastic.h -include target.h -g
CXX_FLAGS = -Wall -I${PREFIX}/usr/include -include stdio.h -include kiss/kiss.h -include blobtastic/blobtastic.hpp -include target.h -g CXX_FLAGS = -Wall -I${PREFIX}/usr/include -include stdio.h -include kiss/kiss.h -include blobtastic/blobtastic.hpp -include target.h -g
LD_FLAGS = -L${PREFIX}/usr/lib -lkiss2 -lglfw -lblobtastic LD_FLAGS = -L${PREFIX}/usr/lib -lkiss2 -lblobtastic


[osx] [osx]
LD_FLAGS = -framework OpenGL -framework CoreFoundation -framework IOKit -framework Cocoa LD_FLAGS = -framework OpenGL -framework CoreFoundation -framework IOKit -framework Cocoa
1 change: 1 addition & 0 deletions src/MainWindow.cpp
Expand Up @@ -106,6 +106,7 @@ const bool MainWindow::run(const QString& name)
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
// TODO: This will only work on OS X // TODO: This will only work on OS X
env.insert("DYLD_LIBRARY_PATH", QDir::currentPath() + "/prefix/usr/lib:" + env.value("DYLD_LIBRARY_PATH")); env.insert("DYLD_LIBRARY_PATH", QDir::currentPath() + "/prefix/usr/lib:" + env.value("DYLD_LIBRARY_PATH"));
env.insert("DYLD_LIBRARY_PATH", QDir::currentPath() + "/prefix/usr:" + env.value("DYLD_LIBRARY_PATH"));
m_process->setProcessEnvironment(env); m_process->setProcessEnvironment(env);
m_process->setWorkingDirectory(m_workingDirectory.path()); m_process->setWorkingDirectory(m_workingDirectory.path());
ui->console->setProcess(m_process); ui->console->setProcess(m_process);
Expand Down

0 comments on commit f5cdbc1

Please sign in to comment.