mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 10:54:15 +02:00
Code Issues Projects Releases Wiki Activity

Compile fixes for renderer, no lua, and no gravfft options

Browse Source
This commit is contained in:
jacob1
2021-06-28 21:02:59 -04:00
parent 6dd7d9bd46
commit 26327effd5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pch/pch_cpp.h
View File

@@ -1,13 +1,13 @@
#include "Config.h" #include "Config.h"
#include "common/Format.h" #include "common/Format.h"
#include "common/Platform.h"
#include "common/Singleton.h" #include "common/Singleton.h"
#include "common/String.h" #include "common/String.h"
#include "common/tpt-compat.h" #include "common/tpt-compat.h"
#include "common/tpt-inline.h" #include "common/tpt-inline.h"
#include "common/tpt-minmax.h" #include "common/tpt-minmax.h"
#include "common/tpt-rand.h" #include "common/tpt-rand.h"
#include "common/tpt-rand.h"
#include <algorithm> #include <algorithm>
#include <array> #include <array>
@@ -56,7 +56,6 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <fftw3.h>
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
@@ -82,7 +81,14 @@
# include <winsock.h> # include <winsock.h>
#endif #endif
#ifdef GRAVFFT
#include <fftw3.h>
#endif
#ifndef NOHTTP
#include <curl/curl.h> #include <curl/curl.h>
#endif
#include <bson/BSON.h> #include <bson/BSON.h>
#include <json/json-forwards.h> #include <json/json-forwards.h>
#include <json/json.h> #include <json/json.h>

2
src/common/Platform.cpp
View File

@@ -484,8 +484,10 @@ String DoMigration(ByteString fromDir, ByteString toDir)
// chdir into the new directory // chdir into the new directory
chdir(toDir.c_str()); chdir(toDir.c_str());
#if !defined(RENDERER) && !defined(FONTEDITOR)
if (scripts.size()) if (scripts.size())
Client::Ref().RescanStamps(); Client::Ref().RescanStamps();
#endif
logFile << std::endl << std::endl << "Migration complete. Results: " << result.Build().ToUtf8(); logFile << std::endl << std::endl << "Migration complete. Results: " << result.Build().ToUtf8();
logFile.close(); logFile.close();