popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Merge branch 'port' of https://github.com/fgsfdsfgs/perfect_dark into port-debugger

Browse Source
This commit is contained in:
fgsfds committed 2024-05-13 15:27:21 +02:00
2 parents 22e49d75e1 62a55a3d6e
commit e5effc4522
2 files changed
+15 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile.port
+11 -6
View File
@@ -151,9 +151,15 @@ G_DIR := src/generated/$(ROMID)
ifneq (,$(findstring windows,$(TARGET_PLATFORM))) ifneq (,$(findstring windows,$(TARGET_PLATFORM)))
TARGET_CFLAGS := $(shell pkg-config sdl2 --cflags-only-I) TARGET_CFLAGS := $(shell pkg-config sdl2 --cflags-only-I)
TARGET_LDFLAGS := $(shell pkg-config sdl2 --libs) -lz -lopengl32 -static-libstdc++ -ldbghelp TARGET_LDFLAGS := $(shell pkg-config sdl2 --libs) -lz -lopengl32 -ldbghelp
# on windows/mingw we need this to be built with a 32-bit compiler so it finds the correct libs # on windows/mingw we need this to be built with a 32-bit compiler so it finds the correct libs
TOOLCHAIN ?= i686-w64-mingw32- TOOLCHAIN ?= i686-w64-mingw32-
# on GCC link libstdc++ statically
ifeq (,$(findstring clang,$(CC))$(findstring clang,$(CXX)))
TARGET_LDFLAGS += -static-libstdc++
else
TARGET_LDFLAGS += -lstdc++
endif
else # assume *nix else # assume *nix
TARGET_CFLAGS := $(shell pkg-config sdl2 --cflags-only-I) TARGET_CFLAGS := $(shell pkg-config sdl2 --cflags-only-I)
TARGET_LDFLAGS := $(shell pkg-config sdl2 --libs) -lGL -lz -ldl TARGET_LDFLAGS := $(shell pkg-config sdl2 --libs) -lGL -lz -ldl
@@ -234,8 +240,8 @@ INCLUDES = \
-I port/src/imgui -I port/src/imgui
TOOLCHAIN ?= TOOLCHAIN ?=
CC := $(TOOLCHAIN)gcc -std=c11 CC ?= $(TOOLCHAIN)gcc
CXX := $(TOOLCHAIN)g++ -std=c++20 CXX ?= $(TOOLCHAIN)g++
ifneq (,$(CXX_O_FILES)) ifneq (,$(CXX_O_FILES))
LD := $(CXX) LD := $(CXX)
else else
@@ -251,7 +257,6 @@ COMMON_CFLAGS := $(C_DEFINES) -DAVOID_UB=1 $(INCLUDES) $(TARGET_CFLAGS) -g \
-fwrapv \ -fwrapv \
-Wall \ -Wall \
-Wno-address \ -Wno-address \
-Wno-aggressive-loop-optimizations \
-Wno-int-in-bool-context \ -Wno-int-in-bool-context \
-Wno-misleading-indentation \ -Wno-misleading-indentation \
-Wno-missing-braces \ -Wno-missing-braces \
@@ -262,8 +267,8 @@ COMMON_CFLAGS := $(C_DEFINES) -DAVOID_UB=1 $(INCLUDES) $(TARGET_CFLAGS) -g \
-Wno-unused-variable \ -Wno-unused-variable \
-Wno-format-truncation -Wno-format-truncation
CFLAGS := $(COMMON_CFLAGS) -Wno-pointer-sign CFLAGS := -std=c11 $(COMMON_CFLAGS) -Wno-pointer-sign
CXXFLAGS := $(COMMON_CFLAGS) -Wno-unused-function CXXFLAGS := -std=c++20 $(COMMON_CFLAGS) -Wno-unused-function
LDFLAGS := $(TARGET_LDFLAGS) LDFLAGS := $(TARGET_LDFLAGS)
# Make ROMID available as an environment variable to all tooling. # Make ROMID available as an environment variable to all tooling.
port/src/system.c
+4 -4
View File
@@ -1,3 +1,7 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE 1
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@@ -28,10 +32,6 @@ __attribute__((dllexport)) u32 AmdPowerXpressRequestHighPerformance = 1;
#else #else
#ifndef _GNU_SOURCE
#define _GNU_SOURCE 1
#endif
#include <unistd.h> #include <unistd.h>
// figure out how to yield // figure out how to yield