Merge pull request #1390 from berryzplus/feature/add_ndebug_to_mydefi…

…nes_if_missing MYDEFINESに-DNDEBUGが指定されてない対策の改良
sakura-editor · Sep 5, 2020 · e34c4aa · e34c4aa
2 parents 2f0a862 + 0523902
commit e34c4aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/sakura_core/Makefile b/sakura_core/Makefile
@@ -60,6 +60,13 @@ DEFINES= \
  -D_UNICODE \
  -DUNICODE \
  $(MYDEFINES)
+
+ifeq (,$(findstring -D_DEBUG,$(DEFINES)))
+ifeq (,$(findstring -DNDEBUG,$(DEFINES)))
+DEFINES += -DNDEBUG
+endif
+endif
+
 CFLAGS= \
  -finput-charset=utf-8 \
  -fexec-charset=cp932 \

diff --git a/sakura_lang_en_US/Makefile b/sakura_lang_en_US/Makefile
@@ -61,18 +61,19 @@ endif
 CC= $(PREFIX)gcc
 RC= $(RCPREFIX)windres
 
-ifeq (-D_DEBUG,$(findstring -D_DEBUG,$(MYDEFINES)))
-else ifeq (-DNDEBUG,$(findstring -DNDEBUG,$(MYDEFINES)))
-else
-MYDEFINES += -DNDEBUG
-endif
-
 DEFINES= \
  -DWIN32 \
  -D_WIN32_WINNT=_WIN32_WINNT_WIN7 \
  -D_UNICODE \
  -DUNICODE \
  $(MYDEFINES)
+
+ifeq (,$(findstring -D_DEBUG,$(DEFINES)))
+ifeq (,$(findstring -DNDEBUG,$(DEFINES)))
+DEFINES += -DNDEBUG
+endif
+endif
+
 LDFLAGS= \
  -static \
  -shared \