Skip to content

Commit

Permalink
Rename LuaPlus/src to LuaPlus/lua51-luaplus in preparation for additi…
Browse files Browse the repository at this point in the history
…onal source directories
  • Loading branch information
jjensen committed Sep 5, 2013
1 parent a686cd0 commit b80ba85
Show file tree
Hide file tree
Showing 108 changed files with 750 additions and 2,144 deletions.
11 changes: 7 additions & 4 deletions Jamfile.jam
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@ SubDir LUAPLUS ;
Workspace LuaPlus :
lua
luac
LuaPlusStatic
$(LUA_VERSION)-static
;

SubIncludeRelative Src LuaPlus : LuaPlusSharedLib ;
SubIncludeRelative Src LuaPlus : LuaPlusStaticLib ;
SubIncludeRelative Tools Lua Lua ;
SubIncludeRelative Tools Lua LuaC ;
SubIncludeRelative Src LuaPlus : Lua ;
SubIncludeRelative Src LuaPlus : LuaC ;

if $(OS) = NT
{
SubInclude LUAPLUS Src ManagedLuaPlus : ManagedLuaPlus ;
# SubInclude LUAPLUS Src ManagedLuaPlus : LuaPlusClrPure ;
SubInclude LUAPLUS Src Lua51Proxy : Lua51Proxy ;

if $(LUA_VERSION) in lua51 lua51-luaplus {
SubInclude LUAPLUS Src Lua51Proxy : Lua51Proxy ;
}
SubInclude LUAPLUS Tools LuaPlusDebuggerAddin ;

Workspace LuaPlus :
Expand Down
17 changes: 12 additions & 5 deletions LUAPLUS.jamrules
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
LUA_VERSION ?= lua51-luaplus ;

###############################################################################
# Set these if the user didn't use jam --workspace.
#ALL_LOCATE_TARGET ?= [ FSubDirPath LUAPLUS obj $(COMPILER.$(PLATFORM)) temp-$(PLATFORM)-$(CONFIG) ] ;
Expand All @@ -9,6 +11,9 @@ DEPCACHE ?= standard ;
#LUAPLUS_OUTPUT_DIRECTORY ?= [ FSubDirPath LUAPLUS bin.$(C.COMPILER).$(PLATFORM) ] ;
LUAPLUS_OUTPUT_DIRECTORY ?= $(LUAPLUS)/bin.$(C.COMPILER).$(PLATFORM) ;

LUA_SOURCE_DIRECTORY_NAME = $(LUA_VERSION) ;
LUAPLUS_INCLUDE_DIRECTORIES = $(LUAPLUS)/Src $(LUAPLUS)/Src/LuaPlus/$(LUA_SOURCE_DIRECTORY_NAME)/src ;

IncludeModule copyfile ;

NotFile download ;
Expand Down Expand Up @@ -36,7 +41,9 @@ rule LuaPlusFixUpTarget TARGET
###############################################################################

if $(OS) = NT {
LUA_CDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/modules ;
if $(LUA_VERSION) in lua51-luaplus {
LUA_CDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/modules ;
}
LUA_LDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/lua ;
} else {
LUA_CDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/lib/lua/5.1 ;
Expand All @@ -51,10 +58,10 @@ rule LuaPlus.CModule TARGET : OUTPUT_NAME : SOURCES : MODULES_SUBDIR {
Depends all : $(TARGET) ;

LuaPlusDefines $(TARGET) ;
C.IncludeDirectories $(TARGET) : "$(LUAPLUS)/Src" "$(LUAPLUS)/Src/LuaPlus/src" ;
C.IncludeDirectories $(TARGET) : $(LUAPLUS_INCLUDE_DIRECTORIES) ;

if $(OS) != MACOSX && $(OS) != LINUX {
C.LinkLibraries $(TARGET) : lua51 ;
C.LinkLibraries $(TARGET) : $(LUA_VERSION) ;
}

OUTPUT_NAME ?= $(TARGET) ;
Expand Down Expand Up @@ -94,10 +101,10 @@ rule Lua.CModule TARGET : OUTPUT_NAME : SOURCES : MODULES_SUBDIR {
Depends all : $(TARGET) ;

LuaPlusDefines $(TARGET) ;
C.IncludeDirectories $(TARGET) : "$(LUAPLUS)/Src/LuaPlus/src" ;
C.IncludeDirectories $(TARGET) : $(LUAPLUS_INCLUDE_DIRECTORIES) ;

if $(OS) != MACOSX && $(OS) != LINUX {
C.LinkLibraries $(TARGET) : lua51 ;
C.LinkLibraries $(TARGET) : $(LUA_VERSION) ;
}

OUTPUT_NAME ?= $(TARGET) ;
Expand Down
2 changes: 1 addition & 1 deletion Samples/MinimalTestLib/MinimalTestLib.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "LuaPlus/LuaPlus.h"
using namespace LuaPlus;
extern "C" {
#include "LuaPlus/src/lualib.h"
#include "lualib.h"
}
//#include <math.h>
//#include <assert.h>
Expand Down
4 changes: 2 additions & 2 deletions Samples/MinimalTestLib/MinimalTestLib.jam
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ local SRCS =
TestUnicode.lua
;

C.IncludeDirectories MinimalTestLib : $(LUAPLUS)/Src ;
C.LinkLibraries MinimalTestLib : LuaPlusStatic ;
C.IncludeDirectories MinimalTestLib : $(LUAPLUS_INCLUDE_DIRECTORIES) ;
C.LinkLibraries MinimalTestLib : $(LUA_VERSION)-static ;

C.Application MinimalTestLib : $(SRCS) ;

Expand Down
2 changes: 1 addition & 1 deletion Samples/TestClass/TestClass.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "LuaPlus/LuaPlus.h"
using namespace LuaPlus;
#include <string>
#include "LuaPlus/src/lstate.h"
#include "lstate.h"

namespace LPCD
{
Expand Down
4 changes: 2 additions & 2 deletions Samples/TestClass/TestClass.jam
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ local SRCS =
TestClass.cpp
;

C.IncludeDirectories TestClass : $(LUAPLUS)/Src ;
C.LinkLibraries TestClass : lua51 ;
C.IncludeDirectories TestClass : $(LUAPLUS_INCLUDE_DIRECTORIES) ;
C.LinkLibraries TestClass : $(LUA_VERSION) ;

C.Application TestClass : $(SRCS) ;

Expand Down
Binary file removed Samples/TestLuaPlusAll/CompileMe.lc
Binary file not shown.
3 changes: 0 additions & 3 deletions Samples/TestLuaPlusAll/CompileMe.lua

This file was deleted.

1 change: 0 additions & 1 deletion Samples/TestLuaPlusAll/Jamfile.jam

This file was deleted.

10 changes: 0 additions & 10 deletions Samples/TestLuaPlusAll/ScriptArrayTest.lua

This file was deleted.

5 changes: 0 additions & 5 deletions Samples/TestLuaPlusAll/ScriptCallbackTest.lua

This file was deleted.

2 changes: 0 additions & 2 deletions Samples/TestLuaPlusAll/ScriptDumpTest.lua

This file was deleted.

31 changes: 0 additions & 31 deletions Samples/TestLuaPlusAll/ScriptSaveTest.lua

This file was deleted.

57 changes: 0 additions & 57 deletions Samples/TestLuaPlusAll/ScriptVectorDump.lua

This file was deleted.

14 changes: 0 additions & 14 deletions Samples/TestLuaPlusAll/ScriptVectorDump.out

This file was deleted.

Binary file removed Samples/TestLuaPlusAll/TestANSI.lua
Binary file not shown.
23 changes: 0 additions & 23 deletions Samples/TestLuaPlusAll/TestLuaPlusAll.jam

This file was deleted.

Binary file removed Samples/TestLuaPlusAll/TestUnicode.lua
Binary file not shown.
61 changes: 0 additions & 61 deletions Samples/TestLuaPlusAll/Timer.h

This file was deleted.

Binary file removed Samples/TestLuaPlusLib/CompileMe.lc
Binary file not shown.
3 changes: 0 additions & 3 deletions Samples/TestLuaPlusLib/CompileMe.lua

This file was deleted.

10 changes: 0 additions & 10 deletions Samples/TestLuaPlusLib/ScriptArrayTest.lua

This file was deleted.

5 changes: 0 additions & 5 deletions Samples/TestLuaPlusLib/ScriptCallbackTest.lua

This file was deleted.

2 changes: 0 additions & 2 deletions Samples/TestLuaPlusLib/ScriptDumpTest.lua

This file was deleted.

31 changes: 0 additions & 31 deletions Samples/TestLuaPlusLib/ScriptSaveTest.lua

This file was deleted.

0 comments on commit b80ba85

Please sign in to comment.