Skip to content

Some compilation fixes #12

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

Some compilation fixes #12

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
53a6047
Fix rectbinpack compilation
AlexDaniel Nov 14, 2020
eff462d
Fix compilation issue with builder.py
AlexDaniel Nov 14, 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
1 change: 1 addition & 0 deletions cdefs/remote.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <dlfcn.h>

CFFI_DLLEXPORT uint32_t kickstart(void);
CFFI_DLLEXPORT int SDL_Init(uint32_t flags) {
kickstart();
return ((int(*)(uint32_t))dlsym(RTLD_NEXT, "SDL_Init"))(flags);
Expand Down
11 changes: 10 additions & 1 deletion rectbinpack/rbp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@ MaxRectsBinPack mbp;

std::vector<Rect> dst;

/*
int MaxRectsBestShortSideFit = MaxRectsBinPack::RectBestShortSideFit; ///< -BSSF: Positions the rectangle against the short side of a free rectangle into which it fits the best.
int MaxRectsBestLongSideFit = MaxRectsBinPack::RectBestLongSideFit; ///< -BLSF: Positions the rectangle against the long side of a free rectangle into which it fits the best.
int MaxRectsBestAreaFit = MaxRectsBinPack::RectBestAreaFit; ///< -BAF: Positions the rectangle into the smallest free rect into which it fits.
int MaxRectsBottomLeftRule = MaxRectsBinPack::RectBottomLeftRule; ///< -BL: Does the Tetris placement.
int MaxRectsContactPointRule = MaxRectsBinPack::RectContactPointRule; ///< -CP: Choosest the placement where the rectangle touches other rects as much as possible.

*/

enum MaxRectsFreeRectChoiceHeuristic {
MaxRectsBestShortSideFit, ///< -BSSF: Positions the rectangle against the short side of a free rectangle into which it fits the best.
MaxRectsBestLongSideFit, ///< -BLSF: Positions the rectangle against the long side of a free rectangle into which it fits the best.
MaxRectsBestAreaFit, ///< -BAF: Positions the rectangle into the smallest free rect into which it fits.
MaxRectsBottomLeftRule, ///< -BL: Does the Tetris placement.
MaxRectsContactPointRule ///< -CP: Choosest the placement where the rectangle touches other rects as much as possible.
};

extern "C" {

Expand Down