From 341f6cad5fd4871e1b4eefa2bc2c54db1a79d664 Mon Sep 17 00:00:00 2001
From: nishi <nishi@0f02c867-ac3d-714e-8a88-971ba1f6efcf>
Date: Fri, 26 Apr 2024 02:54:07 +0000
Subject: [PATCH] fix cmdline

git-svn-id: file:///raid/svn-main/nishi-serenade/trunk@37 0f02c867-ac3d-714e-8a88-971ba1f6efcf
---
 Makefile           | 5 +++--
 cmdline            | 2 +-
 platforms/win32.mk | 1 +
 platforms/win64.mk | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 46f1eec..a41d0f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 # $Id$
 
+CPP = cpp
 CC = cc
 CFLAGS = -std=c99 -g
 LDFLAGS =
-LIBS = `cpp -DLIBS cmdline | grep -vE "^\#" | tr '\\n' ' '`
-EXTRA_OBJS = `cpp -DOBJS cmdline | grep -vE "^\#" | tr '\\n' ' '`
+LIBS = `$(CPP) -DLIBS cmdline | grep -vE "^\#" | tr '\\n' ' '`
+EXTRA_OBJS = `$(CPP) -DOBJS cmdline | grep -vE "^\#" | tr '\\n' ' '`
 SUFFIX =
 
 .if "$(PLATFORM)" != ""
diff --git a/cmdline b/cmdline
index c498495..860c096 100644
--- a/cmdline
+++ b/cmdline
@@ -5,7 +5,7 @@
 #ifdef HAS_FFI_SUPPORT
 -lffi
 #endif
-#if defined(__linux__) && !defined(__MINGW32__)
+#ifdef __linux__
 -ldl
 #endif
 #endif
diff --git a/platforms/win32.mk b/platforms/win32.mk
index 162cd15..40135de 100644
--- a/platforms/win32.mk
+++ b/platforms/win32.mk
@@ -1,5 +1,6 @@
 # $Id$
 # Copy me to trunk/platform.mk
 
+CPP = i686-w64-mingw32-cpp
 CC = i686-w64-mingw32-gcc
 SUFFIX = .exe
diff --git a/platforms/win64.mk b/platforms/win64.mk
index 5c64fea..30fea52 100644
--- a/platforms/win64.mk
+++ b/platforms/win64.mk
@@ -1,5 +1,6 @@
 # $Id$
 # Copy me to trunk/platform.mk
 
+CPP = x86_64-w64-mingw32-cpp
 CC = x86_64-w64-mingw32-gcc
 SUFFIX = .exe
-- 
2.43.0