Add Windows cross-platform support alongside Linux

Replace POSIX-specific socket and process APIs with portable
abstractions so the project builds on both Windows and Linux.

- Add include/network/net_platform.hpp: Winsock2/POSIX socket
  abstraction (socket types, non-blocking, error handling,
  WSAStartup lifecycle)
- Add include/platform/process.hpp: CreateProcess/fork+exec
  abstraction for spawning ffplay subprocesses
- Update network module (tcp_socket, world_socket) to use
  portable socket helpers instead of raw POSIX calls
- Update audio module (music_manager, footstep_manager,
  activity_sound_manager) to use portable process helpers
  instead of fork/exec/kill/waitpid
- Replace hardcoded /tmp/ paths with std::filesystem::temp_directory_path()
- Link ws2_32 and SDL2main on Windows in CMakeLists.txt
This commit is contained in:
Kelsi 2026-02-03 22:24:17 -08:00
parent dd126c6e4b
commit 6bf3fa4ed4
14 changed files with 416 additions and 186 deletions

View file

@ -1,17 +1,14 @@
#include "audio/music_manager.hpp"
#include "pipeline/asset_manager.hpp"
#include "core/logger.hpp"
#include "platform/process.hpp"
#include <fstream>
#include <cstdlib>
#include <csignal>
#include <sys/wait.h>
#include <unistd.h>
namespace wowee {
namespace audio {
MusicManager::MusicManager() {
tempFilePath = "/tmp/wowee_music.mp3";
tempFilePath = platform::getTempFilePath("wowee_music.mp3");
}
MusicManager::~MusicManager() {
@ -54,29 +51,24 @@ void MusicManager::playMusic(const std::string& mpqPath, bool loop) {
out.close();
// Play with ffplay in background
pid_t pid = fork();
if (pid == 0) {
// Child process — create new process group so we can kill all children
setpgid(0, 0);
// Redirect output to /dev/null
freopen("/dev/null", "w", stdout);
freopen("/dev/null", "w", stderr);
std::vector<std::string> args;
args.push_back("-nodisp");
args.push_back("-autoexit");
if (loop) {
args.push_back("-loop");
args.push_back("0");
}
args.push_back("-volume");
args.push_back("30");
args.push_back(tempFilePath);
if (loop) {
execlp("ffplay", "ffplay", "-nodisp", "-autoexit", "-loop", "0",
"-volume", "30", tempFilePath.c_str(), nullptr);
} else {
execlp("ffplay", "ffplay", "-nodisp", "-autoexit",
"-volume", "30", tempFilePath.c_str(), nullptr);
}
_exit(1); // exec failed
} else if (pid > 0) {
playerPid = pid;
playerPid = platform::spawnProcess(args);
if (playerPid != INVALID_PROCESS) {
playing = true;
currentTrack = mpqPath;
LOG_INFO("Music: Playing ", mpqPath);
} else {
LOG_ERROR("Music: fork() failed");
LOG_ERROR("Music: Failed to spawn ffplay process");
}
}
@ -104,12 +96,8 @@ void MusicManager::crossfadeTo(const std::string& mpqPath, float fadeMs) {
void MusicManager::update(float deltaTime) {
// Check if player process is still running
if (playerPid > 0) {
int status;
pid_t result = waitpid(playerPid, &status, WNOHANG);
if (result == playerPid) {
// Process ended
playerPid = -1;
if (playerPid != INVALID_PROCESS) {
if (!platform::isProcessRunning(playerPid)) {
playing = false;
}
}
@ -127,13 +115,8 @@ void MusicManager::update(float deltaTime) {
}
void MusicManager::stopCurrentProcess() {
if (playerPid > 0) {
// Kill the entire process group (ffplay may spawn children)
kill(-playerPid, SIGTERM);
kill(playerPid, SIGTERM);
int status;
waitpid(playerPid, &status, 0);
playerPid = -1;
if (playerPid != INVALID_PROCESS) {
platform::killProcess(playerPid);
playing = false;
}
}