diff options
| author | 2015-02-01 18:42:03 +0100 | |
|---|---|---|
| committer | 2015-02-01 19:26:10 +0100 | |
| commit | 06b848185fb4559750a0f4a8de8a5a7789a9eca5 (patch) | |
| tree | 3aecafa83fd23ffde8732321f5d69af5608d8e3b /makefile | |
| parent | e7f527fbd88b4981c0c4c7820b06ca1e7548ab27 (diff) | |
| parent | 5806f40f572c38effa17b87553d9614413e2fa97 (diff) | |
Changes to the build system:
- BGFX library is set in windows.mak and sdl.mak now. This ensures the
library is only build when needed.
This is necessary to be able to build MAME on systems without opengl
support.
Support was added for an optional BIN location for executables. The
default is still the root folder. Setting BIN=bin e.g. will put
executables in bin.
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -369,7 +369,6 @@ RM = @rm -f OBJDUMP = @objdump PYTHON = @python - #------------------------------------------------- # form the name of the executable #------------------------------------------------- @@ -415,7 +414,7 @@ NAME = $(TARGET)$(SUBTARGET) endif # fullname is prefix+name+suffix+suffix64+suffixdebug -FULLNAME ?= $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE) +FULLNAME ?= $(BIN)$(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE) # add an EXE suffix to get the final emulator name EMULATOR = $(FULLNAME)$(EXE) @@ -708,7 +707,7 @@ endif # this variable #------------------------------------------------- -OBJDIRS = $(OBJ) $(OBJ)/$(TARGET)/$(SUBTARGET) +OBJDIRS += $(OBJ) $(OBJ)/$(TARGET)/$(SUBTARGET) #------------------------------------------------- @@ -797,8 +796,8 @@ LIBS += -lsqlite3 SQLITE3_LIB = endif -# add BGFX library -BGFX_LIB = $(OBJ)/libbgfx.a +# add BGFX library - this is one in sdl.mak / windows.mak +# BGFX_LIB = $(OBJ)/libbgfx.a # add PortMidi MIDI library ifeq ($(BUILD_MIDILIB),1) |
