Merge remote-tracking branch 'origin/main' into messaging

This commit is contained in:
Paolo 2025-09-29 09:25:28 +02:00
commit 092140e1a6
6 changed files with 9 additions and 3 deletions

View File

@ -1,7 +1,7 @@
# #
# Tibia # Tibia
# #
# Copyright (C) 2024 Orastron Srl unipersonale # Copyright (C) 2024, 2025 Orastron Srl unipersonale
# #
# Tibia is free software: you can redistribute it and/or modify # Tibia is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

View File

@ -63,6 +63,8 @@ ifeq ($(UNAME_S), Darwin)
CFLAGS_ALL := $(CFLAGS_ALL) -arch arm64 -arch x86_64 CFLAGS_ALL := $(CFLAGS_ALL) -arch arm64 -arch x86_64
LDFLAGS_ALL := $(LDFLAGS_ALL) -arch arm64 -arch x86_64 LDFLAGS_ALL := $(LDFLAGS_ALL) -arch arm64 -arch x86_64
CXXFLAGS_ALL := $(CXXFLAGS_ALL) -arch arm64 -arch x86_64 CXXFLAGS_ALL := $(CXXFLAGS_ALL) -arch arm64 -arch x86_64
else
LDFLAGS_ALL := -static $(LDFLAGS_ALL)
endif endif
PROGRAM := $(BUNDLE_NAME)$(EXE_SUFFIX) PROGRAM := $(BUNDLE_NAME)$(EXE_SUFFIX)

View File

@ -1,7 +1,7 @@
/* /*
* Tibia * Tibia
* *
* Copyright (C) 2024 Orastron Srl unipersonale * Copyright (C) 2024, 2025 Orastron Srl unipersonale
* *
* Tibia is free software: you can redistribute it and/or modify * Tibia is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

View File

@ -77,6 +77,8 @@ ifeq ($(UNAME_S), Darwin)
CFLAGS_ALL := $(CFLAGS_ALL) -arch arm64 -arch x86_64 CFLAGS_ALL := $(CFLAGS_ALL) -arch arm64 -arch x86_64
LDFLAGS_ALL := $(LDFLAGS_ALL) -arch arm64 -arch x86_64 LDFLAGS_ALL := $(LDFLAGS_ALL) -arch arm64 -arch x86_64
CXXFLAGS_ALL := $(CXXFLAGS_ALL) -arch arm64 -arch x86_64 CXXFLAGS_ALL := $(CXXFLAGS_ALL) -arch arm64 -arch x86_64
else
LDFLAGS_ALL := -static $(LDFLAGS_ALL)
endif endif
DLL_FILE := $(BUNDLE_NAME)$(DLL_SUFFIX) DLL_FILE := $(BUNDLE_NAME)$(DLL_SUFFIX)

View File

@ -84,6 +84,8 @@ ifeq ($(UNAME_S), Darwin)
ifeq ($(HAS_UI), yes) ifeq ($(HAS_UI), yes)
LDFLAGS_ALL := $(LDFLAGS_ALL) -Wl,-framework,Foundation -Wl,-framework,Cocoa -Wl,-framework,Corevideo LDFLAGS_ALL := $(LDFLAGS_ALL) -Wl,-framework,Foundation -Wl,-framework,Cocoa -Wl,-framework,Corevideo
endif endif
else
LDFLAGS_ALL := -static $(LDFLAGS_ALL)
endif endif
ifeq ($(UNAME_S), Linux) ifeq ($(UNAME_S), Linux)

View File

@ -1,7 +1,7 @@
/* /*
* Tibia * Tibia
* *
* Copyright (C) 2023, 2024 Orastron Srl unipersonale * Copyright (C) 2023-2025 Orastron Srl unipersonale
* *
* Tibia is free software: you can redistribute it and/or modify * Tibia is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by