Skip to content

[BROKEN] Switch to Oberon00's LuaBind 0.9.1 fork #273

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
Architector4 wants to merge 7 commits into
base: development
Choose a base branch
from
Open

[BROKEN] Switch to Oberon00's LuaBind 0.9.1 fork #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d2b1a5
change #include <unzip.h> to #include <minizip/unzip.h>
Architector4 Mar 4, 2026
ebacfb4
[BROKEN] Switch to Oberon00's LuaBind 0.9.1 fork
Architector4 Mar 4, 2026
9017aa0
remove derived property definitions
HeliumAnt Mar 5, 2026
cf7fba0
fix build: move boost to boost subfolder
HeliumAnt Mar 5, 2026
3870ce8
remove unused luabind stuff
HeliumAnt Mar 5, 2026
71ae028
add headers to luabind source (to keep parity with original cmake
HeliumAnt Mar 5, 2026
3bfd541
add some missing boost headers (probably luabind header deps)
HeliumAnt Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 11 additions & 11 deletions RTEA.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source/Lua/LuaBindingsActivities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ LuaBindingRegisterFunctionDefinitionForType(ActivityLuaBindings, Activity) {
.property("HumanCount", &Activity::GetHumanCount)
.property("TeamCount", &Activity::GetTeamCount)
.property("Difficulty", &Activity::GetDifficulty, &Activity::SetDifficulty)
.property("CraftsOrbitAtTheEdge", &Activity::GetCraftOrbitAtTheEdge, &Activity::SetCraftOrbitAtTheEdge)

.def("DeactivatePlayer", &Activity::DeactivatePlayer)
.def("PlayerActive", &Activity::PlayerActive)
Expand Down Expand Up @@ -118,7 +119,6 @@ LuaBindingRegisterFunctionDefinitionForType(ActivityLuaBindings, GameActivity) {
.property("CPUTeam", &GameActivity::GetCPUTeam, &GameActivity::SetCPUTeam)
.property("DeliveryDelay", &GameActivity::GetDeliveryDelay, &GameActivity::SetDeliveryDelay)
.property("BuyMenuEnabled", &GameActivity::GetBuyMenuEnabled, &GameActivity::SetBuyMenuEnabled)
.property("CraftsOrbitAtTheEdge", &GameActivity::GetCraftOrbitAtTheEdge, &GameActivity::SetCraftOrbitAtTheEdge)

//.def_readwrite("ActorCursor", &GameActivity::m_ActorCursor)
.def_readwrite("CursorTimer", &GameActivity::m_CursorTimer)
Expand Down
2 changes: 1 addition & 1 deletion Source/Lua/LuaBindingsEntities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "LuaBindingRegisterDefinitions.h"

#include "MovableObject.h"
#include "PieSlice.h"
#include "SoundSet.h"

Expand Down Expand Up @@ -921,7 +922,6 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {

.property("Material", &MovableObject::GetMaterial)
.property("Mass", &MovableObject::GetMass, &MovableObject::SetMass)
.property("Pos", &MovableObject::GetPos, &MovableObject::SetPos)
.property("Vel", &MovableObject::GetVel, &MovableObject::SetVel)
.property("PrevPos", &MovableObject::GetPrevPos)
.property("PrevVel", &MovableObject::GetPrevVel)
Expand Down
4 changes: 2 additions & 2 deletions Source/Managers/ActivityMan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#include "MusicMan.h"

#include "zip.h"
#include "unzip.h"
#include "minizip/zip.h"
#include "minizip/unzip.h"

#include "tracy/Tracy.hpp"

Expand Down
4 changes: 2 additions & 2 deletions Source/Menus/SaveLoadMenuGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#include <execution>

#include "zip.h"
#include "unzip.h"
#include "minizip/zip.h"
#include "minizip/unzip.h"

using namespace RTE;

Expand Down
2 changes: 1 addition & 1 deletion Source/System/System.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "System.h"

#include "RTETools.h"
#include "unzip.h"
#include "minizip/unzip.h"

#include "RTEError.h"

Expand Down
85 changes: 0 additions & 85 deletions external/include/boost_1_75/boost/assert.hpp
View file
Open in desktop

This file was deleted.

93 changes: 0 additions & 93 deletions external/include/boost_1_75/boost/assert/source_location.hpp
View file
Open in desktop

This file was deleted.

Loading
Loading