Merge pull request #722 from paulsapps/main

Allow building psyq-obj-parser.cc on its own more easily

Author: nicolasnoble

src/core/psxemulator.h

@@ -46,13 +46,7 @@
 
 #ifndef MAXPATHLEN
 #ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
+#include "support/windowswrapper.h"
 #endif
 #ifdef MAX_PATH
 #define MAXPATHLEN MAX_PATH

src/gui/resources-unix.cc

@@ -19,6 +19,7 @@
 
 #ifndef _WIN32
 
+#include "core/system.h"
 #include "gui/resources.h"
 #include "support/file.h"
 

src/support/file.cc

@@ -20,6 +20,8 @@
 #include "support/file.h"
 
 #include <algorithm>
+#include <assert.h>
+#include "support/windowswrapper.h"
 
 const uint8_t PCSX::File::m_internalBuffer = 0;
 

src/support/file.h

@@ -24,8 +24,8 @@
 
 #include <filesystem>
 
-#include "core/psxemulator.h"
 #include "support/slice.h"
+#include "support/ssize_t.h"
 
 namespace PCSX {
 

src/support/ssize_t.h

@@ -0,0 +1,25 @@
+/***************************************************************************
+ *   Copyright (C) 2022 PCSX-Redux authors                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ ***************************************************************************/
+
+#pragma once
+
+
+#ifdef _WIN32
+typedef intptr_t ssize_t;
+#endif

src/support/windowswrapper.h

@@ -0,0 +1,32 @@
+/***************************************************************************
+ *   Copyright (C) 2022 PCSX-Redux authors                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ ***************************************************************************/
+
+#pragma once
+
+#ifdef _WIN32
+// Chop down the size of the windows.h to reduce pollution and build times
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+// Don't #define min or max as it will break std::min/max
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif

tools/ps1-packer/ps1-packer.cc

@@ -19,7 +19,7 @@
 
 #include <memory.h>
 #include <stdint.h>
-
+#include <assert.h>
 #include <vector>
 
 #include "flags.h"

tools/psyq-obj-parser/psyq-obj-parser.cc

@@ -19,13 +19,15 @@
 
 #include <list>
 #include <map>
+#include <assert.h>
 
 #include "elfio/elfio.hpp"
 #include "flags.h"
 #include "support/djbhash.h"
 #include "support/file.h"
 #include "support/hashtable.h"
 #include "support/slice.h"
+#include "support/windowswrapper.h"
 
 #define vprint(...) \
     if (verbose) fmt::print(__VA_ARGS__)