Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for parametrized lua files #1

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ debug/
Debug/
Release/
RelWithDebInfo/
cmake-build-debug/
.idea/

4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SET (CMAKE_SKIP_BUILD_RPATH FALSE)
SET (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
SET (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_AUTOMOC ON)

# Enable proper C++11 flags
INCLUDE(CheckCXXCompilerFlag)
Expand Down Expand Up @@ -69,6 +70,8 @@ SET ( SCENEGL_SRCS
SET ( QtGLBaseApp_SRCS
src/main.cc
src/GLWidget.cc
src/ExpressionLuaTable.cc
src/ExpressionPropertyBrowser.cc
src/PuppeteerApp.cc
glew/src/glew.c
## CHART STUFF
Expand All @@ -79,6 +82,7 @@ QT5_WRAP_CPP ( QtGLBaseApp_MOC_SRCS
src/PuppeteerApp.h
src/PuppeteerAboutDialog.h
src/GLWidget.h
src/ExpressionPropertyBrowser.h
)

ADD_LIBRARY ( SceneGL STATIC
Expand Down
Loading