summaryrefslogtreecommitdiffstatshomepage
path: root/src/build/build.mak
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2008-02-21 23:53:29 +0000
committer Couriersud <couriersud@users.noreply.github.com>2008-02-21 23:53:29 +0000
commit9c460a624831ee632aacf5c691039d4b7cc59151 (patch)
treef4eb3d25830eb0810f98717c6f807fd04db1743d /src/build/build.mak
parent885d66e31a83d4d18b2337d73b69e1e2d56553fc (diff)
Makefile & build system update:
* verinfo: New syntax. verinfo now uses the following syntax: verinfo.exe -b windows|winui|mess. Does not depend on compile time defines any longer. * makefile will include - if it exists - src/osd/$(CROSS_BUILD_OSD)/build.mak. This was necessary to enable cross builds for winui. winui adds mkhelp to build tools and the rules for mkhelp thus had to be moved outside src/osd/winui/winui.mak * Tested on Linux 64bit, Linux 32bit, Windows 32bit mingw, Windows 32bit MSVC * Cross build environment to be posted to the list
Diffstat (limited to 'src/build/build.mak')
-rw-r--r--src/build/build.mak11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/build/build.mak b/src/build/build.mak
index d7c1a001a09..de333e56930 100644
--- a/src/build/build.mak
+++ b/src/build/build.mak
@@ -9,11 +9,6 @@
#
###########################################################################
-
-BUILDSRC = $(SRC)/build
-BUILDOBJ = $(OBJ)/build
-BUILDOUT = $(BUILDOBJ)
-
OBJDIRS += \
$(BUILDOBJ) \
@@ -23,8 +18,10 @@ OBJDIRS += \
# set of build targets
#-------------------------------------------------
-FILE2STR = $(BUILDOUT)/file2str$(EXE)
-PNG2BDC = $(BUILDOUT)/png2bdc$(EXE)
+FILE2STR = $(BUILDOUT)/file2str$(BUILD_EXE)
+PNG2BDC = $(BUILDOUT)/png2bdc$(BUILD_EXE)
+VERINFO = $(BUILDOUT)/verinfo$(BUILD_EXE)
+
VERINFO = $(BUILDOUT)/verinfo$(EXE)
ifneq ($(CROSS_BUILD),1)