summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2008-02-22 00:17:36 +0000
committer Couriersud <couriersud@users.noreply.github.com>2008-02-22 00:17:36 +0000
commit504337cfb19aa02ce39dc9c7f468f7fb7a849e1b (patch)
treef6c586c95b8f4a57337dc96fa2c90a78a6e4002c /makefile
parent9c460a624831ee632aacf5c691039d4b7cc59151 (diff)
Followup to r767:
* submit changes to makefile omitted in r767
Diffstat (limited to 'makefile')
-rw-r--r--makefile14
1 files changed, 14 insertions, 0 deletions
diff --git a/makefile b/makefile
index 2672ebb2e51..08a8d42b094 100644
--- a/makefile
+++ b/makefile
@@ -43,6 +43,9 @@ ifndef OSD
OSD = windows
endif
+ifndef CROSS_BUILD_OSD
+CROSS_BUILD_OSD = $(OSD)
+endif
#-------------------------------------------------
@@ -187,6 +190,10 @@ ifeq ($(TARGETOS),os2)
EXE = .exe
endif
+ifndef BUILD_EXE
+BUILD_EXE = $(EXE)
+endif
+
# compiler, linker and utilities
AR = @ar
CC = @gcc
@@ -442,7 +449,13 @@ endif
all: maketree buildtools emulator tools
+#-------------------------------------------------
+# defines needed by multiple make files
+#-------------------------------------------------
+BUILDSRC = $(SRC)/build
+BUILDOBJ = $(OBJ)/build
+BUILDOUT = $(BUILDOBJ)
#-------------------------------------------------
# include the various .mak files
@@ -456,6 +469,7 @@ include $(SRC)/$(TARGET)/$(SUBTARGET).mak
include $(SRC)/emu/emu.mak
include $(SRC)/lib/lib.mak
include $(SRC)/build/build.mak
+-include $(SRC)/osd/$(CROSS_BUILD_OSD)/build.mak
include $(SRC)/tools/tools.mak
# combine the various definitions to one