Skip to content

Commit 9341e45

Browse files
committed
xrCore: move PPMd compressor to Compression folder
1 parent a4b8c36 commit 9341e45

18 files changed

+66
-84
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/xrCore/ppmd_compressor.h renamed to src/xrCore/Compression/ppmd_compressor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PPMD_COMPRESSOR_H
22
#define PPMD_COMPRESSOR_H
33

4-
#include "fastdelegate.h"
4+
#include "xrCore/fastdelegate.h"
55

66
namespace compression
77
{

src/xrCore/xrCore.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
#if defined(WINDOWS)
77
#include <mmsystem.h>
88
#include <objbase.h>
9+
#pragma comment(lib, "winmm.lib")
910
#endif
1011
#include "xrCore.h"
1112
#include "Threading/ThreadPool.hpp"
1213
#include "Math/MathUtil.hpp"
1314
#include "xrCore/_std_extensions.h"
1415

15-
#pragma comment(lib, "winmm.lib")
16+
#include "Compression/compression_ppmd_stream.h"
17+
extern compression::ppmd::stream* trained_model;
1618

1719
XRCORE_API xrCore Core;
1820

@@ -123,10 +125,6 @@ void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pc
123125
init_counter++;
124126
}
125127

126-
#ifndef _EDITOR
127-
#include "compression_ppmd_stream.h"
128-
extern compression::ppmd::stream* trained_model;
129-
#endif
130128
void xrCore::_destroy()
131129
{
132130
--init_counter;
@@ -138,14 +136,12 @@ void xrCore::_destroy()
138136
xr_FS.reset();
139137
xr_EFS.reset();
140138

141-
#ifndef _EDITOR
142139
if (trained_model)
143140
{
144141
void* buffer = trained_model->buffer();
145142
xr_free(buffer);
146143
xr_delete(trained_model);
147144
}
148-
#endif
149145
xr_free(Params);
150146
Memory._destroy();
151147
}

0 commit comments

Comments
 (0)