Skip to content

Commit c1eb588

Browse files
committed
Merge pull request #42 from elite-lang/dev
Dev
2 parents 2d5f6e5 + 09e2170 commit c1eb588

File tree

19 files changed

+1139
-87
lines changed

19 files changed

+1139
-87
lines changed

CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
2222

2323
## include路径配置
2424
include_directories(src extlib/include
25-
Lex/include
26-
LR_Scanner/includes
27-
RedApple/includes
28-
Builder/include
25+
Lex/include
26+
LR_Scanner/includes
27+
RedApple/includes
28+
Builder/include
2929
MetaScriptRunner/include
3030
ExIconv/include
3131
)
@@ -53,7 +53,7 @@ if(UNIX)
5353
endif()
5454

5555
target_link_libraries(elite builder meta red scanner lex lua exiconv
56-
${LLVM_LIBS} ${dl_lib_link})
56+
${LLVM_LIBS} ${dl_lib_link})
5757

5858
if (CMAKE_BUILD_TYPE EQUAL "Debug")
5959
target_link_libraries(elite oolua_d)
@@ -69,4 +69,3 @@ include(cmake/CombineHeader.cmake)
6969
include(cmake/ThirdPartyBuild.cmake)
7070

7171
add_subdirectory(doc)
72-

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ release:
88

99
test:
1010
-mkdir build
11-
cd build && cmake .. -DBUILD_TEST=ON -DCOVERAGE_FLAG=ON && make deps && make
11+
cd build && cmake .. -DBUILD_TEST=ON -DCOVERAGE_FLAG=ON && make deps && make
1212

1313
only_test:
1414
-mkdir build
@@ -22,4 +22,3 @@ deps:
2222
rm:
2323
-rm -rf ./build
2424
-rm -rf ./extlib
25-

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ Elite分为如下几个模块:
162162
- 邮箱:<mailto:sunxfancy@gmail.com>
163163
- gitter:[参与讨论](https://gitter.im/elite-lang/Elite?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
164164

165+
## 特别感谢
166+
167+
熊同学赞助的机械键盘,帮助我更快的打字 O(∩_∩)O哈哈~
168+
165169
## 开源协议
166170

167171
MIT协议,允许任何人基于该项目开发其他项目,无论是开源的还是商业的,仅仅需要您在使用时,附带我们的版权声明即可。

0 commit comments

Comments
 (0)