Skip to content

Commit

Permalink
setup the flag STDBOOL
Browse files Browse the repository at this point in the history
set it for both C and C++, since API is in C, while concrete implementaions are in C++
  • Loading branch information
LEOYoon-Tsaw committed May 13, 2024
1 parent 06cc2dc commit 39a51fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $(RIME_DEPS):
$(MAKE) -C librime deps

librime: $(RIME_DEPS)
$(MAKE) -C librime release install
$(MAKE) -C librime CFLAGS="-DSTDBOOL" CXXFLAGS="-DSTDBOOL" release install
$(MAKE) copy-rime-binaries

copy-rime-binaries:
Expand Down
2 changes: 2 additions & 0 deletions Squirrel-Bridging-Header.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#define STDBOOL

#import <rime_api.h>
#import <rime/key_table.h>
4 changes: 4 additions & 0 deletions Squirrel.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -619,12 +619,14 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
OTHER_CFLAGS = "-DSTDBOOL";
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_CPLUSPLUSFLAGS = (
"-DLEOPARD",
"-DHAVE_CONFIG_H",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
"-DSTDBOOL",
);
OTHER_LDFLAGS = "-lrime.1";
PRODUCT_BUNDLE_IDENTIFIER = im.rime.inputmethod.Squirrel;
Expand Down Expand Up @@ -673,12 +675,14 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
OTHER_CFLAGS = "-DSTDBOOL";
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_CPLUSPLUSFLAGS = (
"-DLEOPARD",
"-DHAVE_CONFIG_H",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
"-DSTDBOOL",
);
OTHER_LDFLAGS = "-lrime.1";
PRODUCT_BUNDLE_IDENTIFIER = im.rime.inputmethod.Squirrel;
Expand Down

0 comments on commit 39a51fc

Please sign in to comment.