aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--com32/libutil/Makefile10
-rw-r--r--com32/samples/Makefile8
2 files changed, 9 insertions, 9 deletions
diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile
index 90545e31..c3cc4149 100644
--- a/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@ -35,16 +35,16 @@ gcc_ok = $(shell if gcc $(1) -c -x c /dev/null -o /dev/null 2>/dev/null; \
M32 := $(call gcc_ok,-m32,)
-CC = gcc $(M32)
+CC = gcc
LD = ld -m elf_i386
AR = ar
NASM = nasm
RANLIB = ranlib
-CFLAGS = -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include
-SFLAGS = -D__COM32__ -march=i386
+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include
+SFLAGS = $(M32) -D__COM32__ -march=i386
LDFLAGS = -T ../lib/com32.ld
-LNXCFLAGS = -I./include -W -Wall -march=i386 -Os -g
-LNXSFLAGS = -march=i386
+LNXCFLAGS = -I./include -W -Wall -O -g
+LNXSFLAGS = -g
LNXLDFLAGS = -g
OBJCOPY = objcopy
LIBOBJS = ansiline.o ansiraw.o get_key.o
diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index 97985afa..709f4ca8 100644
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -20,14 +20,14 @@ gcc_ok = $(shell if gcc $(1) -c -x c /dev/null -o /dev/null 2>/dev/null; \
M32 := $(call gcc_ok,-m32,)
-CC = gcc $(M32)
+CC = gcc
LD = ld -m elf_i386
AR = ar
NASM = nasm
RANLIB = ranlib
-CFLAGS = -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__
-LNXCFLAGS = -W -Wall -march=i386 -Os -g -I../libutil/include
-LNXSFLAGS = -march=i386
+CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__
+LNXCFLAGS = -W -Wall -O -g -I../libutil/include
+LNXSFLAGS = -g
LNXLDFLAGS = -g
SFLAGS = -D__COM32__ -march=i386
LDFLAGS = -T ../lib/com32.ld