twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #49 from toyg/osx_makefile_backport 

osx makefile backport of be34510
miguelfreitas
miguelfreitas 11 years ago
parent
9d5d203a0c 43ac45c925
commit
7e5c85279a
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/makefile.osx

4
src/makefile.osx vendored
Unescape View File

@ -168,7 +168,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC="$(CC)" CXX="$(CXX)" OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
# #
# libtorrent hack # libtorrent hack
@ -180,7 +180,7 @@ DEFS += -DTORRENT_DEBUG
DEFS += -DBOOST_ASIO_SEPARATE_COMPILATION DEFS += -DBOOST_ASIO_SEPARATE_COMPILATION
#DEFS += -DBOOST_ASIO_DYN_LINK #DEFS += -DBOOST_ASIO_DYN_LINK
../libtorrent/src/.libs/libtorrent-rasterbar.a: ../libtorrent/src/.libs/libtorrent-rasterbar.a:
@echo "Building libtorrent ..." && cd ../libtorrent && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" && cd ../src @echo "Building libtorrent ..." && cd ../libtorrent && $(MAKE) CC="$(CC)" CXX="$(CXX)" OPT="$(xCXXFLAGS)" && cd ../src
# auto-generated dependencies: # auto-generated dependencies:

Write Preview
Loading…
Cancel
Save