Correct how Makefile set debug mode

This commit is contained in:
Duy Tran Khanh committed 2021-08-04 05:30:29 +07:00
1 parent d90c336b24
commit fa62e8d268
3 files changed
+13 -3

No files matched your search

+11 -2
View File
@@ -10,6 +10,14 @@ DETECT := $(shell clang -v 2>&1 | grep Target | cut -b 9-60)
# version 1.3 on iPhone9,1 running 14.6
VERSION := $(shell cat DEBIAN/control | grep Version | cut -b 9-60)
COMMIT := $(shell git log --oneline | sed '2,10000000d' | cut -b 1-7)
ifndef RELEASE
RELEASE := 0
endif
ifeq ($(filter 1,$(RELEASE)),)
CMAKE_BUILD_TYPE := RelWithDebInfo
else
CMAKE_BUILD_TYPE := Debug
endif
# Distinguish iOS from macOS
ifneq ($(filter arm64-apple-ios%,$(DETECT)),)
@@ -97,7 +105,7 @@ native:
@echo 'Starting build task - native application'
@mkdir -p Natives/build
@cd Natives/build && cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
-DCMAKE_CROSSCOMPILING=true \
-DCMAKE_SYSTEM_NAME=Darwin \
-DCMAKE_SYSTEM_PROCESSOR=aarch64 \
@@ -105,8 +113,9 @@ native:
-DCMAKE_OSX_ARCHITECTURES=arm64 \
-DCMAKE_C_FLAGS="-arch arm64 -miphoneos-version-min=12.0" \
-DCONFIG_COMMIT="$(COMMIT)" \
-DCONFIG_RELEASE=$(RELEASE) \
..
@cd Natives/build && cmake --build . --config Release --target awt_headless awt_xawt pojavexec PojavLauncher
@cd Natives/build && cmake --build . --config $(CMAKE_BUILD_TYPE) --target awt_headless awt_xawt pojavexec PojavLauncher
@rm Natives/build/libawt_headless.dylib
@echo 'Finished build task - native application'
+1 -1
View File
@@ -5,7 +5,7 @@
#import <sys/utsname.h>
#ifdef NDEBUG
#if CONFIG_RELEASE == 1
# define CONFIG_TYPE "release"
#else
# define CONFIG_TYPE "debug"
+1
View File
@@ -12,6 +12,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rpath @executable_path/Fr
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -rpath /usr/lib/jvm/java-8-openjdk/lib")
add_definitions(-DCONFIG_COMMIT="${CONFIG_COMMIT}")
add_definitions(-DCONFIG_RELEASE=${CONFIG_RELEASE})
# EXT: stub library, delete after compile awt_xawt
add_library(awt_headless SHARED