Skip to content

Corrected paths to lua headers #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeeingBlue wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Corrected paths to lua headers #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
258b23a
Correctly paths to lua headers
SeeingBlue Jan 12, 2020
629dc9d
Updated Platform version and toolset
SeeingBlue Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/game_things/things.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function load()
datPath = resolvepath('/things/' .. filename)
sprPath = resolvepath('/things/' .. filename)
else
datPath = resolvepath('/things/' .. version .. '/Tibia')
sprPath = resolvepath('/things/' .. version .. '/Tibia')
datPath = resolvepath('/things/' .. version .. '/Tibia.dat')
sprPath = resolvepath('/things/' .. version .. '/Tibia.spr')
end

local errorMessage = ''
Expand Down
10 changes: 5 additions & 5 deletions src/framework/luaengine/lbitlib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#define LUA_LIB

extern "C" {
#include <lua.h>
#include <lauxlib.h>
#include <luajit/lua.h>
#include <luajit/lauxlib.h>
}

/* ----- adapted from lua-5.2.0 luaconf.h: ----- */
Expand Down Expand Up @@ -175,10 +175,10 @@ static lua_Unsigned luaL_checkunsigned (lua_State *L, int arg) {
#define lbitlib_c
#define LUA_LIB

#include "lua.h"
#include "luajit/lua.h"

#include "lauxlib.h"
#include "lualib.h"
#include "luajit/lauxlib.h"
#include "luajit/lualib.h"


/* number of bits to consider in a number */
Expand Down
2 changes: 1 addition & 1 deletion src/framework/luaengine/luainterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "luaobject.h"

#include <framework/core/resourcemanager.h>
#include <lua.hpp>
#include <luajit/lua.hpp>

#include "lbitlib.h"

Expand Down
2 changes: 2 additions & 0 deletions things/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
10 changes: 5 additions & 5 deletions vc14/otclient.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}</ProjectGuid>
<RootNamespace>otclient</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down