aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2012-06-28 20:19:30 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2012-06-28 20:19:30 -0400
commitc3a32be6582676f2ee3704d9e7fa3edc27d7257f (patch)
tree6f21cfab9a7fd78cfbb2f42f5877ba5f195aefd6
parenteb0419f911aef80a8feae08195ca82180e6b7973 (diff)
downloadtextadept-c3a32be6582676f2ee3704d9e7fa3edc27d7257f.tar.gz
textadept-c3a32be6582676f2ee3704d9e7fa3edc27d7257f.zip
Fix compiling on Mac OSX and building release packages; src/Makefile
-rw-r--r--src/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index d0851c51..1063c0f8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -48,7 +48,7 @@ else ifeq (Darwin, $(shell uname -s))
CXXFLAGS = -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 \
-isysroot /Developer/SDKs/MacOSX10.5.sdk
LUAFLAGS = -DLUA_USE_MACOSX
- LDFLAGS = -rdynamic
+ LDFLAGS = -liconv -rdynamic
#ifneq (ncurses, $(MAKECMDGOALS))
plat_flag = -DGTK
@@ -121,8 +121,8 @@ osx-ncurses: textadept-ncurses.osx textadeptjit-ncurses.osx
tmp:
rm -rf /tmp/tabuild && hg clone ../ /tmp/tabuild
- cp -rL ../doc ../lexers ../modules /tmp/tabuild/
- cp -r gtdialog LexLPeg.cxx lua luajit scintilla termkey win32gtk \
+ cp -rL Doxygen ../doc ../lexers ../modules /tmp/tabuild/
+ cp -r gtdialog gtkosx LexLPeg.cxx lua luajit scintilla termkey win32gtk \
/tmp/tabuild/src/
cd /tmp/tabuild/src/luajit && make clean
ln -s `pwd`/../releases /tmp/tabuild