Skip to content
Permalink
Browse files
Merge branch 'feature/cpp'
  • Loading branch information
Jittapan Pluemsumran committed May 5, 2017
2 parents a3282c1 + 2e524f1 commit 4a004ad4b83d2b46f56b4e57a8a6f3e487372ea6
Showing with 946 additions and 617 deletions.
  1. +6 −1 .travis.yml
  2. +774 −549 configure
  3. +8 −8 configure.in
  4. +10 −0 src/common/Makefile.in
  5. +16 −15 src/common/core.c
  6. +8 −0 src/common/core.h
  7. +7 −1 src/common/db.h
  8. +8 −0 src/common/ers.h
  9. +7 −0 src/common/malloc.h
  10. +15 −15 src/common/mempool.c
  11. +13 −6 src/common/mempool.h
  12. +8 −0 src/common/showmsg.h
  13. +8 −0 src/common/socket.h
  14. +7 −0 src/common/sql.h
  15. +14 −0 src/common/strlib.h
  16. +14 −14 src/common/thread.c
  17. +15 −8 src/common/thread.h
  18. +8 −0 src/common/timer.h
@@ -1,7 +1,8 @@
language: c
language: cpp
compiler:
- clang
- gcc
dist: trusty

before_script:
- uname -a
@@ -24,6 +25,10 @@ before_script:
- mysql -u $DB_ROOT $DB_NAME < sql-files/mob_skill_db2_re.sql || aborterror "Unable to import renewal monster skill 2 table."
- mysql -u $DB_ROOT $DB_NAME < sql-files/roulette_default_data.sql || aborterror "Unable to import roulette table."
- mysql -u $DB_ROOT -e "GRANT ALL ON *.* TO '$DB_USER'@'$DB_HOST' IDENTIFIED BY '$DB_PASS';"
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -q
- sudo apt-get install gcc-4.8 -y
- sudo apt-get install g++-4.8 -y

script:
- ./configure $CONFIGURE_FLAGS

0 comments on commit 4a004ad

Please sign in to comment.