Skip to content

Commit

Permalink
make lua imports version independent
Browse files Browse the repository at this point in the history
  • Loading branch information
wg committed Jan 21, 2018
1 parent 91655b5 commit 9d71b2f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ ifneq ($(WITH_LUAJIT),)
CFLAGS += -I$(WITH_LUAJIT)/include
LDFLAGS += -L$(WITH_LUAJIT)/lib
else
DEPS += $(ODIR)/lib/libluajit-5.1.a
CFLAGS += -I$(ODIR)/include/luajit-2.0
DEPS += $(ODIR)/lib/libluajit-5.1.a
endif

ifneq ($(WITH_OPENSSL),)
Expand Down
6 changes: 3 additions & 3 deletions src/script.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#define SCRIPT_H

#include <stdbool.h>
#include <luajit-2.0/lua.h>
#include <luajit-2.0/lualib.h>
#include <luajit-2.0/lauxlib.h>
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <unistd.h>
#include "stats.h"
#include "wrk.h"
Expand Down
2 changes: 1 addition & 1 deletion src/wrk.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <openssl/ssl.h>
#include <openssl/err.h>
#include <luajit-2.0/lua.h>
#include <lua.h>

#include "stats.h"
#include "ae.h"
Expand Down

0 comments on commit 9d71b2f

Please sign in to comment.