mirror of
https://github.com/The-Powder-Toy/The-Powder-Toy.git
synced 2025-01-17 22:38:38 +01:00
Compile fixes for renderer, no lua, and no gravfft options
This commit is contained in:
parent
6dd7d9bd46
commit
26327effd5
@ -1,13 +1,13 @@
|
||||
#include "Config.h"
|
||||
|
||||
#include "common/Format.h"
|
||||
#include "common/Platform.h"
|
||||
#include "common/Singleton.h"
|
||||
#include "common/String.h"
|
||||
#include "common/tpt-compat.h"
|
||||
#include "common/tpt-inline.h"
|
||||
#include "common/tpt-minmax.h"
|
||||
#include "common/tpt-rand.h"
|
||||
#include "common/tpt-rand.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
@ -56,7 +56,6 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <fftw3.h>
|
||||
#include <float.h>
|
||||
#include <math.h>
|
||||
#include <stdint.h>
|
||||
@ -82,7 +81,14 @@
|
||||
# include <winsock.h>
|
||||
#endif
|
||||
|
||||
#ifdef GRAVFFT
|
||||
#include <fftw3.h>
|
||||
#endif
|
||||
|
||||
#ifndef NOHTTP
|
||||
#include <curl/curl.h>
|
||||
#endif
|
||||
|
||||
#include <bson/BSON.h>
|
||||
#include <json/json-forwards.h>
|
||||
#include <json/json.h>
|
||||
|
@ -484,8 +484,10 @@ String DoMigration(ByteString fromDir, ByteString toDir)
|
||||
// chdir into the new directory
|
||||
chdir(toDir.c_str());
|
||||
|
||||
#if !defined(RENDERER) && !defined(FONTEDITOR)
|
||||
if (scripts.size())
|
||||
Client::Ref().RescanStamps();
|
||||
#endif
|
||||
|
||||
logFile << std::endl << std::endl << "Migration complete. Results: " << result.Build().ToUtf8();
|
||||
logFile.close();
|
||||
|
Loading…
x
Reference in New Issue
Block a user