Skip to content
Snippets Groups Projects
Commit b468e0e7 authored by rswindell's avatar rswindell
Browse files

Couple bug-fixes (use LIBODIR, not ODIR, CFLAGS, not CLFAGS).

parent ef9c483b
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ DELETE = echo y | del ...@@ -24,7 +24,7 @@ DELETE = echo y | del
!ifdef msc # Microsoft Visual C++ !ifdef msc # Microsoft Visual C++
CC = cl CC = cl
LD = link LD = link
ODIR = msvc.Win32 LIBODIR = msvc.Win32
OUTPUT = -Fo OUTPUT = -Fo
LOUTPUT = -Fe LOUTPUT = -Fe
CFLAGS = -nologo -MTd CFLAGS = -nologo -MTd
...@@ -37,12 +37,12 @@ CFLAGS = $(CFLAGS) -Yd ...@@ -37,12 +37,12 @@ CFLAGS = $(CFLAGS) -Yd
CC = bcc32 CC = bcc32
LD = ilink32 LD = ilink32
ODIR = bcc.Win32 # Output directory LIBODIR = bcc.Win32 # Output directory
OUTPUT = -o OUTPUT = -o
LOUTPUT = $(OUTPUT) LOUTPUT = $(OUTPUT)
CFLAGS = -n$(ODIR) -WM -q CFLAGS = -n$(LIBODIR) -WM -q
LFLAGS = $(CFLAGS) LFLAGS = $(CFLAGS)
CLFAGS = $(CFLAGS) -M -WD -WM -X- CFLAGS = $(CFLAGS) -M -WD -WM -X-
!ifdef DEBUG !ifdef DEBUG
CFLAGS = $(CFLAGS) -v CFLAGS = $(CFLAGS) -v
!endif !endif
...@@ -55,9 +55,9 @@ CFLAGS = $(CFLAGS) -Od -D_DEBUG ...@@ -55,9 +55,9 @@ CFLAGS = $(CFLAGS) -Od -D_DEBUG
# Debug or release build? # Debug or release build?
!ifdef DEBUG !ifdef DEBUG
ODIR = $(ODIR).debug LIBODIR = $(LIBODIR).debug
!else !else
ODIR = $(ODIR).release LIBODIR = $(LIBODIR).release
!endif !endif
!include objects.mk # defines $(OBJS) !include objects.mk # defines $(OBJS)
...@@ -68,10 +68,10 @@ ODIR = $(ODIR).release ...@@ -68,10 +68,10 @@ ODIR = $(ODIR).release
@$(CC) $(CFLAGS) -c $< $(OUTPUT)$@ @$(CC) $(CFLAGS) -c $< $(OUTPUT)$@
# Create output directories if they don't exist # Create output directories if they don't exist
$(ODIR): $(LIBODIR):
@if not exist $(ODIR) mkdir $(ODIR) @if not exist $(LIBODIR) mkdir $(LIBODIR)
# Executable Build Rule # Executable Build Rule
$(WRAPTEST): $(ODIR)\wraptest.obj $(OBJS) $(WRAPTEST): $(LIBODIR)\wraptest.obj $(OBJS)
@echo Linking $@ @echo Linking $@
@$(CC) $(LFLAGS) $** $(LOUTPUT)$@ @$(CC) $(LFLAGS) $** $(LOUTPUT)$@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment