Skip to content

Commit

Permalink
librime.0.dylib.
Browse files Browse the repository at this point in the history
  • Loading branch information
lotem committed Nov 8, 2013
1 parent 83c0043 commit 0c9740b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 24 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Squirrel.xcodeproj/project.xcworkspace/
Squirrel.xcodeproj/xcuserdata/
build
build.log
lib/*.a
bin/*
lib/*
package
*~
.*.swp
23 changes: 16 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@ all: release
install: install-release

ESSAY = brise/essay.kct
LIBRIME = librime/xbuild/lib/Release/librime.dylib
LIBRIME = lib/librime.0.dylib

LIBRIME_OUTPUT = librime/xbuild/lib/Release/librime.0.dylib
RIME_DEPLOYER_OUTPUT = librime/xbuild/bin/Release/rime_deployer
RIME_DICT_MANAGER_OUTPUT = librime/xbuild/bin/Release/rime_dict_manager

$(ESSAY):
cd brise; make essay
$(MAKE) essay

$(LIBRIME):
$(MAKE) librime

essay:
cd brise; make essay

$(LIBRIME):
cd librime; make -f Makefile.xcode

librime:
cd librime; make -f Makefile.xcode
cp -L $(LIBRIME_OUTPUT) $(LIBRIME)
cp $(RIME_DEPLOYER_OUTPUT) bin/
cp $(RIME_DICT_MANAGER_OUTPUT) bin/

release: $(ESSAY) $(LIBRIME)
xcodebuild -project Squirrel.xcodeproj -configuration Release build | grep -v setenv | tee build.log
Expand All @@ -40,5 +47,7 @@ install-release:
"/Library/Input Methods/Squirrel.app/Contents/Resources/postflight"

clean:
rm -rf build
rm build.log
rm -rf build > /dev/null 2>&1 || true
rm build.log > /dev/null 2>&1 || true
rm bin/* > /dev/null 2>&1 || true
rm lib/* > /dev/null 2>&1 || true
26 changes: 10 additions & 16 deletions Squirrel.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
44B4F7A015A929E4009DFF5D /* zyenpheng.schema.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 44B4F79915A929E4009DFF5D /* zyenpheng.schema.yaml */; };
44C49DF317F8155000847938 /* stroke.dict.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 44C49DEF17F814AF00847938 /* stroke.dict.yaml */; };
44C49DF417F8155000847938 /* stroke.schema.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 44C49DF017F814AF00847938 /* stroke.schema.yaml */; };
44CD640C15E2646B0021234E /* librime.dylib in Copy 3rd-party Frameworks */ = {isa = PBXBuildFile; fileRef = 44CD640915E2633D0021234E /* librime.dylib */; };
44CD640C15E2646B0021234E /* librime.0.dylib in Copy 3rd-party Frameworks */ = {isa = PBXBuildFile; fileRef = 44CD640915E2633D0021234E /* librime.0.dylib */; };
44CD7D9F1828D981006E9222 /* rime.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 44CD7D9E1828D981006E9222 /* rime.pdf */; };
44CDB5451780AB38008930FB /* sampheng.schema.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 44CDB5431780AA95008930FB /* sampheng.schema.yaml */; };
44D3E63C16B6BFAE00D2E12B /* symbols.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 44D3E63616B6BF4200D2E12B /* symbols.yaml */; };
Expand Down Expand Up @@ -168,7 +168,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
44CD640C15E2646B0021234E /* librime.dylib in Copy 3rd-party Frameworks */,
44CD640C15E2646B0021234E /* librime.0.dylib in Copy 3rd-party Frameworks */,
44E8CD9A166B857F002C8EE3 /* Growl.framework in Copy 3rd-party Frameworks */,
44F01493152AF6AF00EFDAC3 /* Sparkle.framework in Copy 3rd-party Frameworks */,
);
Expand Down Expand Up @@ -225,7 +225,7 @@
44B4F79915A929E4009DFF5D /* zyenpheng.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = zyenpheng.schema.yaml; sourceTree = "<group>"; };
44C49DEF17F814AF00847938 /* stroke.dict.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stroke.dict.yaml; sourceTree = "<group>"; };
44C49DF017F814AF00847938 /* stroke.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stroke.schema.yaml; sourceTree = "<group>"; };
44CD640915E2633D0021234E /* librime.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = librime.dylib; path = librime/xbuild/lib/Release/librime.dylib; sourceTree = "<group>"; };
44CD640915E2633D0021234E /* librime.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = librime.0.dylib; path = lib/librime.0.dylib; sourceTree = "<group>"; };
44CD7D9E1828D981006E9222 /* rime.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = rime.pdf; sourceTree = "<group>"; };
44CDB5431780AA95008930FB /* sampheng.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sampheng.schema.yaml; sourceTree = "<group>"; };
44D3E63616B6BF4200D2E12B /* symbols.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = symbols.yaml; path = brise/symbols.yaml; sourceTree = "<group>"; };
Expand All @@ -241,8 +241,8 @@
44DA7A2E14DD596700C1ED3B /* luna_pinyin_fluency.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = luna_pinyin_fluency.schema.yaml; sourceTree = "<group>"; };
44DA7A2F14DD596700C1ED3B /* luna_pinyin_simp.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = luna_pinyin_simp.schema.yaml; sourceTree = "<group>"; };
44DA7A3014DD596700C1ED3B /* luna_pinyin_tw.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = luna_pinyin_tw.schema.yaml; sourceTree = "<group>"; };
44E21A8E16A653E700C2B08F /* rime_deployer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_deployer; path = librime/xbuild/bin/Release/rime_deployer; sourceTree = "<group>"; };
44E21A8F16A653E700C2B08F /* rime_dict_manager */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_dict_manager; path = librime/xbuild/bin/Release/rime_dict_manager; sourceTree = "<group>"; };
44E21A8E16A653E700C2B08F /* rime_deployer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_deployer; path = bin/rime_deployer; sourceTree = "<group>"; };
44E21A8F16A653E700C2B08F /* rime_dict_manager */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_dict_manager; path = bin/rime_dict_manager; sourceTree = "<group>"; };
44E8CD98166B8542002C8EE3 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
44E98EA514AE16DD00847AD6 /* checked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = checked.h; sourceTree = "<group>"; };
44E98EA614AE16DD00847AD6 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -310,7 +310,7 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
44CD640915E2633D0021234E /* librime.dylib */,
44CD640915E2633D0021234E /* librime.0.dylib */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
44E8CD98166B8542002C8EE3 /* Growl.framework */,
44F01492152AF6AF00EFDAC3 /* Sparkle.framework */,
Expand Down Expand Up @@ -622,7 +622,7 @@
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
);
OTHER_LDFLAGS = (
"-lrime",
"-lrime.0",
"-lz",
"-lstdc++",
);
Expand Down Expand Up @@ -659,7 +659,7 @@
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
);
OTHER_LDFLAGS = (
"-lrime",
"-lrime.0",
"-lz",
"-lstdc++",
);
Expand All @@ -681,10 +681,7 @@
HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/librime/include\"";
HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/librime/thirdparty/include\"";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks\n\n@loader_path/../Library/OpenSource\n\n@loader_path/../Library/Frameworks /usr/lib /usr/local/lib";
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/lib",
"$(SRCROOT)/librime/xbuild/lib/Release",
);
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib";
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand All @@ -704,10 +701,7 @@
HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/librime/include\"";
HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/librime/thirdparty/include\"";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks\n\n@loader_path/../Library/OpenSource\n\n@loader_path/../Library/Frameworks /usr/lib";
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/lib",
"$(SRCROOT)/librime/xbuild/lib/Release",
);
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib";
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down
Empty file added bin/.placeholder
Empty file.

0 comments on commit 0c9740b

Please sign in to comment.