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

Using $(EXEODIR) instead of $(ODIR) (required by new make system).

parent b04d31fa
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ LD = ilink32 ...@@ -17,7 +17,7 @@ LD = ilink32
SLASH = \\ SLASH = \\
OFILE = obj OFILE = obj
EXEFILE = .exe EXEFILE = .exe
ODIR = bcc.win32 # Executable output directory EXEODIR = bcc.win32 # Executable output directory
XPDEV = ..\..\xpdev XPDEV = ..\..\xpdev
UIFC = ..\..\uifc UIFC = ..\..\uifc
LIB = ..\..\..\lib LIB = ..\..\..\lib
...@@ -40,43 +40,44 @@ CFLAGS = $(CFLAGS) -q -d -H -X- -w-csu -w-pch -w-ccc -w-rch -w-par -w-pro -w-800 ...@@ -40,43 +40,44 @@ CFLAGS = $(CFLAGS) -q -d -H -X- -w-csu -w-pch -w-ccc -w-rch -w-par -w-pro -w-800
!ifdef DEBUG !ifdef DEBUG
CFLAGS = $(CFLAGS) -v -Od -D_DEBUG CFLAGS = $(CFLAGS) -v -Od -D_DEBUG
LFLAGS = $(LFLAGS) -v LFLAGS = $(LFLAGS) -v
ODIR = $(ODIR).debug EXEODIR = $(EXEODIR).debug
!else !else
ODIR = $(ODIR).release EXEODIR = $(EXEODIR).release
!endif !endif
LIBODIR = $(EXEODIR)
# Cross platform/compiler definitions # Cross platform/compiler definitions
!include targets.mk # defines all targets !include targets.mk # defines all targets
!include objects.mk # defines $(OBJS) !include objects.mk # defines $(OBJS)
!ifdef USE_UIFC32 !ifdef USE_UIFC32
OBJS = $(OBJS) $(ODIR)\uifc32.$(OFILE) OBJS = $(OBJS) $(EXEODIR)\uifc32.$(OFILE)
CFLAGS = $(CFLAGS) -DUSE_UIFC32 CFLAGS = $(CFLAGS) -DUSE_UIFC32
!else !else
OBJS = $(OBJS) $(ODIR)\uifc.$(OFILE) OBJS = $(OBJS) $(EXEODIR)\uifc.$(OFILE)
!endif !endif
!ifdef USE_FLTK !ifdef USE_FLTK
CFLAGS = $(CFLAGS) -DUSE_FLTK -I$(INCLUDE)\fltk CFLAGS = $(CFLAGS) -DUSE_FLTK -I$(INCLUDE)\fltk
OBJS = $(OBJS) $(ODIR)\uifcfltk.$(OFILE) $(LIB)/fltk/win32/fltk.lib OBJS = $(OBJS) $(EXEODIR)\uifcfltk.$(OFILE) $(LIB)/fltk/win32/fltk.lib
!endif !endif
# Implicit C Compile Rule for SCFG # Implicit C Compile Rule for SCFG
.c.$(OFILE): .c.$(OFILE):
@$(CC) $(CFLAGS) -n$(ODIR) -c $< @$(CC) $(CFLAGS) -n$(EXEODIR) -c $<
.cpp.$(OFILE): .cpp.$(OFILE):
@$(CC) $(CFLAGS) -n$(ODIR) -c $< @$(CC) $(CFLAGS) -n$(EXEODIR) -c $<
# Create output directories if they don't exist # Create output directories if they don't exist
$(ODIR): $(EXEODIR):
@if not exist $(ODIR) mkdir $(ODIR) @if not exist $(EXEODIR) mkdir $(EXEODIR)
$(MAKEHELP): makehelp.c $(MAKEHELP): makehelp.c
@$(CC) -q -n$(ODIR) $? @$(CC) -q -n$(EXEODIR) $?
$(SCFGHELP): $(OBJS) $(MAKEHELP) $(SCFGHELP): $(OBJS) $(MAKEHELP)
@$(MAKEHELP) $(ODIR) @$(MAKEHELP) $(EXEODIR)
# Monolithic SCFG executable Build Rule # Monolithic SCFG executable Build Rule
$(SCFG): $(OBJS) $(SCFG): $(OBJS)
......
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