-
Notifications
You must be signed in to change notification settings - Fork 21
Adds an OS X Makefile #4
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
base: master
Are you sure you want to change the base?
Changes from all commits
372d8db
c3c192a
2f341cc
a2347fd
2172012
033ceb0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| include Makefile | ||
|
|
||
| CC=g++ | ||
| COPTS=-fPIC -O2 -m64 -Wall | ||
| LDOPTS=-shared -Wl,-soname,$(LIBRARY) | ||
| #CXXFLAGS=-std=c++11 | ||
| COPTS=-fPIC -O2 -m64 -Wall -std=c++11 -c | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There shouldn't be anything in this library that requires C++11 support
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. c++11 is now required by MSP, and some new features we are looking to add (supporting multiple correlation functions) want to utilized std::shared_ptr, so this will be necessary going forward. |
||
| LDOPTS=-shared -Wl,-install_name,$(LIBRARY) | ||
| INSTDIR=$(PWD)/linux64 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| include Makefile | ||
|
|
||
| CC=clang++ | ||
|
|
||
| LIBRARY=$(LIBNAME).dylib.$(LIBVERSION) | ||
|
|
||
| COPTS=-fPIC -O2 -m64 -Wall -stdlib=libc++ -std=c++11 | ||
| LDOPTS=-dynamiclib -Wl,-install_name,@rpath/$(LIBRARY) | ||
| INSTDIR=$(PWD)/mac | ||
|
|
||
| clean:: | ||
| $(RM) $(OBJS) $(LIBRARY) *~ | ||
|
|
||
| install:: | ||
| $(RM) $(INSTDIR)/lib/$(LIBNAME).so && $(LN) $(LIBRARY) $(INSTDIR)/lib/$(LIBNAME).dylib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think these changes are necessary.$@ should be the same as $ (LIBRARY)