Skip to content

Switch weakjack to submodule#3970

Merged
tresf merged 2 commits into
LMMS:masterfrom
tresf:weakjack
Nov 17, 2017
Merged

Switch weakjack to submodule#3970
tresf merged 2 commits into
LMMS:masterfrom
tresf:weakjack

Conversation

@tresf

@tresf tresf commented Nov 13, 2017

Copy link
Copy Markdown
Member

Switches weakjack to submodule.

Testers needed!

The AppImage (specifically, linuxdeployqt) was segfaulting while I was trying to test this, but it also was happening on current master, so it may be an issue with my build system.

To create an AppImage: make install && make appimage

Note, this will cause a merge conflict with syncs from stable-1.2 due to d4d909c.

@tresf

tresf commented Nov 14, 2017

Copy link
Copy Markdown
Member Author

Comment thread src/CMakeLists.txt
ENDIF()

IF(LMMS_HAVE_WEAKJACK)
LIST(APPEND LMMS_SRCS "${WEAKJACK_INCLUDE_DIRS}/weak_libjack.c")

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lukas-w I wasn't really to sure where the best place for these were, so I placed them here. A second set of eyes is appreciated, but I think it's ready to merge.

@tresf tresf mentioned this pull request Nov 14, 2017
@tresf tresf merged commit 5e2c105 into LMMS:master Nov 17, 2017
@tresf tresf deleted the weakjack branch November 17, 2017 20:26
@PhysSong

Copy link
Copy Markdown
Member

weakjack submodule doesn't have any files matches any globs in:

SET(VALID_CRUMBS "CMakeLists.txt;Makefile;Makefile.in;Makefile.am;configure.ac;configure.py;autogen.sh")

@tresf

tresf commented Nov 21, 2017

Copy link
Copy Markdown
Member Author

@PhysSong thanks, fixed via d634ed3. I've added .gitignore to the list of files to look for in a submodule.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants