mirror of
https://github.com/love2d/love.git
synced 2026-08-20 04:30:09 +02:00
Nuke MemoryData, as it's been superseded by base64
--HG-- branch : minor
This commit is contained in:
@@ -29,7 +29,6 @@
|
|||||||
A946D680104248DA002BF36C /* Matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E310420ABF007D418B /* Matrix.cpp */; };
|
A946D680104248DA002BF36C /* Matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E310420ABF007D418B /* Matrix.cpp */; };
|
||||||
A946D681104248DA002BF36C /* Object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E810420ABF007D418B /* Object.cpp */; };
|
A946D681104248DA002BF36C /* Object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E810420ABF007D418B /* Object.cpp */; };
|
||||||
A946D682104248DA002BF36C /* Vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69EF10420ABF007D418B /* Vector.cpp */; };
|
A946D682104248DA002BF36C /* Vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69EF10420ABF007D418B /* Vector.cpp */; };
|
||||||
A946D683104248DA002BF36C /* MemoryData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E510420ABF007D418B /* MemoryData.cpp */; };
|
|
||||||
A946D684104248DA002BF36C /* wrap_Data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69F210420ABF007D418B /* wrap_Data.cpp */; };
|
A946D684104248DA002BF36C /* wrap_Data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69F210420ABF007D418B /* wrap_Data.cpp */; };
|
||||||
A946D685104248DA002BF36C /* runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69EC10420ABF007D418B /* runtime.cpp */; };
|
A946D685104248DA002BF36C /* runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69EC10420ABF007D418B /* runtime.cpp */; };
|
||||||
A946D686104248DA002BF36C /* Exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E010420ABF007D418B /* Exception.cpp */; };
|
A946D686104248DA002BF36C /* Exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E69E010420ABF007D418B /* Exception.cpp */; };
|
||||||
@@ -236,8 +235,6 @@
|
|||||||
A93E69E210420ABF007D418B /* math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; };
|
A93E69E210420ABF007D418B /* math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; };
|
||||||
A93E69E310420ABF007D418B /* Matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix.cpp; sourceTree = "<group>"; };
|
A93E69E310420ABF007D418B /* Matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix.cpp; sourceTree = "<group>"; };
|
||||||
A93E69E410420ABF007D418B /* Matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Matrix.h; sourceTree = "<group>"; };
|
A93E69E410420ABF007D418B /* Matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Matrix.h; sourceTree = "<group>"; };
|
||||||
A93E69E510420ABF007D418B /* MemoryData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryData.cpp; sourceTree = "<group>"; };
|
|
||||||
A93E69E610420ABF007D418B /* MemoryData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryData.h; sourceTree = "<group>"; };
|
|
||||||
A93E69E710420ABF007D418B /* Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Module.h; sourceTree = "<group>"; };
|
A93E69E710420ABF007D418B /* Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Module.h; sourceTree = "<group>"; };
|
||||||
A93E69E810420ABF007D418B /* Object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Object.cpp; sourceTree = "<group>"; };
|
A93E69E810420ABF007D418B /* Object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Object.cpp; sourceTree = "<group>"; };
|
||||||
A93E69E910420ABF007D418B /* Object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Object.h; sourceTree = "<group>"; };
|
A93E69E910420ABF007D418B /* Object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Object.h; sourceTree = "<group>"; };
|
||||||
@@ -731,8 +728,6 @@
|
|||||||
A93E69E210420ABF007D418B /* math.h */,
|
A93E69E210420ABF007D418B /* math.h */,
|
||||||
A93E69E310420ABF007D418B /* Matrix.cpp */,
|
A93E69E310420ABF007D418B /* Matrix.cpp */,
|
||||||
A93E69E410420ABF007D418B /* Matrix.h */,
|
A93E69E410420ABF007D418B /* Matrix.h */,
|
||||||
A93E69E510420ABF007D418B /* MemoryData.cpp */,
|
|
||||||
A93E69E610420ABF007D418B /* MemoryData.h */,
|
|
||||||
A93E69E710420ABF007D418B /* Module.h */,
|
A93E69E710420ABF007D418B /* Module.h */,
|
||||||
A93E69E810420ABF007D418B /* Object.cpp */,
|
A93E69E810420ABF007D418B /* Object.cpp */,
|
||||||
A93E69E910420ABF007D418B /* Object.h */,
|
A93E69E910420ABF007D418B /* Object.h */,
|
||||||
@@ -1505,7 +1500,6 @@
|
|||||||
A946D680104248DA002BF36C /* Matrix.cpp in Sources */,
|
A946D680104248DA002BF36C /* Matrix.cpp in Sources */,
|
||||||
A946D681104248DA002BF36C /* Object.cpp in Sources */,
|
A946D681104248DA002BF36C /* Object.cpp in Sources */,
|
||||||
A946D682104248DA002BF36C /* Vector.cpp in Sources */,
|
A946D682104248DA002BF36C /* Vector.cpp in Sources */,
|
||||||
A946D683104248DA002BF36C /* MemoryData.cpp in Sources */,
|
|
||||||
A946D684104248DA002BF36C /* wrap_Data.cpp in Sources */,
|
A946D684104248DA002BF36C /* wrap_Data.cpp in Sources */,
|
||||||
A946D685104248DA002BF36C /* runtime.cpp in Sources */,
|
A946D685104248DA002BF36C /* runtime.cpp in Sources */,
|
||||||
A946D686104248DA002BF36C /* Exception.cpp in Sources */,
|
A946D686104248DA002BF36C /* Exception.cpp in Sources */,
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2006-2011 LOVE Development Team
|
|
||||||
*
|
|
||||||
* This software is provided 'as-is', without any express or implied
|
|
||||||
* warranty. In no event will the authors be held liable for any damages
|
|
||||||
* arising from the use of this software.
|
|
||||||
*
|
|
||||||
* Permission is granted to anyone to use this software for any purpose,
|
|
||||||
* including commercial applications, and to alter it and redistribute it
|
|
||||||
* freely, subject to the following restrictions:
|
|
||||||
*
|
|
||||||
* 1. The origin of this software must not be misrepresented; you must not
|
|
||||||
* claim that you wrote the original software. If you use this software
|
|
||||||
* in a product, an acknowledgment in the product documentation would be
|
|
||||||
* appreciated but is not required.
|
|
||||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
* misrepresented as being the original software.
|
|
||||||
* 3. This notice may not be removed or altered from any source distribution.
|
|
||||||
**/
|
|
||||||
|
|
||||||
// LOVE
|
|
||||||
#include "MemoryData.h"
|
|
||||||
|
|
||||||
namespace love
|
|
||||||
{
|
|
||||||
MemoryData::MemoryData(void * data, int size)
|
|
||||||
: data(data), size(size)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
MemoryData::~MemoryData()
|
|
||||||
{
|
|
||||||
// Memory should be static.
|
|
||||||
}
|
|
||||||
|
|
||||||
void * MemoryData::getData() const
|
|
||||||
{
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
int MemoryData::getSize() const
|
|
||||||
{
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // love
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2006-2011 LOVE Development Team
|
|
||||||
*
|
|
||||||
* This software is provided 'as-is', without any express or implied
|
|
||||||
* warranty. In no event will the authors be held liable for any damages
|
|
||||||
* arising from the use of this software.
|
|
||||||
*
|
|
||||||
* Permission is granted to anyone to use this software for any purpose,
|
|
||||||
* including commercial applications, and to alter it and redistribute it
|
|
||||||
* freely, subject to the following restrictions:
|
|
||||||
*
|
|
||||||
* 1. The origin of this software must not be misrepresented; you must not
|
|
||||||
* claim that you wrote the original software. If you use this software
|
|
||||||
* in a product, an acknowledgment in the product documentation would be
|
|
||||||
* appreciated but is not required.
|
|
||||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
* misrepresented as being the original software.
|
|
||||||
* 3. This notice may not be removed or altered from any source distribution.
|
|
||||||
**/
|
|
||||||
|
|
||||||
#ifndef LOVE_MEMORY_DATA_H
|
|
||||||
#define LOVE_MEMORY_DATA_H
|
|
||||||
|
|
||||||
// LOVE
|
|
||||||
#include "Data.h"
|
|
||||||
|
|
||||||
namespace love
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Allows files to be embedded into LOVE and used in Lua. This
|
|
||||||
* class assumes the referenced memory area is static, which means
|
|
||||||
* it will not attempt to delete the memory.
|
|
||||||
**/
|
|
||||||
class MemoryData : public Data
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pointer to the memory area.
|
|
||||||
**/
|
|
||||||
void * data;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Size of the memory pointed to.
|
|
||||||
**/
|
|
||||||
int size;
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new MemoryData.
|
|
||||||
* @param data Pointer to the static memory.
|
|
||||||
* @param size Size of the memory data.
|
|
||||||
**/
|
|
||||||
MemoryData(void * data, int size);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Destructor. Does NOTHING.
|
|
||||||
**/
|
|
||||||
virtual ~MemoryData();
|
|
||||||
|
|
||||||
// Implements Data.
|
|
||||||
void * getData() const;
|
|
||||||
int getSize() const;
|
|
||||||
|
|
||||||
}; // MemoryData
|
|
||||||
} // love
|
|
||||||
|
|
||||||
#endif // LOVE_MEMORY_DATA_H
|
|
||||||
@@ -22,7 +22,6 @@
|
|||||||
#include <common/config.h>
|
#include <common/config.h>
|
||||||
#include <common/version.h>
|
#include <common/version.h>
|
||||||
#include <common/runtime.h>
|
#include <common/runtime.h>
|
||||||
#include <common/MemoryData.h>
|
|
||||||
|
|
||||||
#ifdef LOVE_WINDOWS
|
#ifdef LOVE_WINDOWS
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user