minor fixes

[ia32rtools.git] / winelib.mak

diff --git a/winelib.mak b/winelib.mak
index cda9fd9..c9b23ce 100644 (file)
--- a/winelib.mak
+++ b/winelib.mak
@@ -2,25 +2,36 @@
 CC = winegcc
 RC = wrc
 
-CFLAGS += -Wall -ggdb -fno-strict-aliasing -mno-cygwin
+CFLAGS += -Wall -g -gdwarf-2 -fno-strict-aliasing -mno-cygwin
 ifndef DEBUG
 CFLAGS += -O2
 endif
-LDFLAGS += -ggdb
+LDFLAGS += -g
+# uncomment to use wine's msvcrt as the C library instead of glibc
+# LDFLAGS += -mno-cygwin
 
 ifdef ARM
-WGCC_FLAGS += -marm -b$(patsubst %-,%,$(CROSS_COMPILE))
-# WGCC_FLAGS += --sysroot $(HOME)/stuff/wine_arm/wine-arm-build/
-CFLAGS += $(WGCC_FLAGS)
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=neon
-CFLAGS += -Wno-unused
+CFLAGS += -Wno-unused -fsigned-char
+WGCC_FLAGS += -marm
+ifneq ($(CROSS_COMPILE),)
+WGCC_FLAGS += -b$(patsubst %-,%,$(CROSS_COMPILE))
+endif
+# wine defines wchar_t correctly, doesn't use -fshort-wchar, we can't too
+WGCC_FLAGS += -fno-short-wchar
+# WGCC_FLAGS += --sysroot $(WINEROOT)
+CFLAGS += $(WGCC_FLAGS)
 LDFLAGS += $(WGCC_FLAGS)
+
 # should not be needed, but..
-CFLAGS += -isystem$(HOME)/stuff/wine_arm/inst/include/wine/msvcrt
-CFLAGS += -isystem$(HOME)/stuff/wine_arm/inst/include/wine/windows
-LDFLAGS += -L$(HOME)/stuff/wine_arm/inst/lib/wine
+WINEROOT ?= $(HOME)/stuff/wine_arm/inst
+CFLAGS += -isystem$(WINEROOT)/include/wine/msvcrt
+CFLAGS += -isystem$(WINEROOT)/include/wine/windows
+LDFLAGS += -L$(WINEROOT)/lib/wine -L$(WINEROOT)/lib
+
 CVT_OPT = -a
 BUILTIN = 1
+export ARM
 else
 CFLAGS += -Wno-unused-but-set-variable
 CFLAGS += -m32