diff options
author | Oliver Stöneberg <firewave@users.noreply.github.com> | 2012-09-20 23:18:34 +0000 |
---|---|---|
committer | Oliver Stöneberg <firewave@users.noreply.github.com> | 2012-09-20 23:18:34 +0000 |
commit | 616f0c70391638bdf8ae46a424c62e237abe2779 (patch) | |
tree | 5212254edeccda3bca758b128e288885367b36cc | |
parent | de3154e557369242700e2f75d4a58a8139186b89 (diff) |
added resources and icon for UME / added UME support to verinfo and updated the usage string (no whatsnew)
-rw-r--r-- | .gitattributes | 4 | ||||
-rw-r--r-- | src/build/verinfo.c | 16 | ||||
-rw-r--r-- | src/ume/osd/windows/ume.ico | bin | 0 -> 353118 bytes | |||
-rw-r--r-- | src/ume/osd/windows/ume.man | 10 | ||||
-rw-r--r-- | src/ume/osd/windows/ume.rc | 49 | ||||
-rw-r--r-- | src/ume/osd/windows/windows.mak | 41 | ||||
-rw-r--r-- | src/ume/ume.mak | 3 |
7 files changed, 121 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 458b359baa0..d4f15ec41b1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7740,6 +7740,10 @@ src/tools/src2html.c svneol=native#text/plain src/tools/srcclean.c svneol=native#text/plain src/tools/tools.mak svneol=native#text/plain src/tools/unidasm.c svneol=native#text/plain +src/ume/osd/windows/ume.ico -text +src/ume/osd/windows/ume.man svneol=CRLF#text/plain eol=crlf +src/ume/osd/windows/ume.rc svneol=native#text/plain +src/ume/osd/windows/windows.mak svneol=native#text/plain src/ume/ume.c svneol=native#text/plain src/ume/ume.lst svneol=native#text/plain src/ume/ume.mak svneol=native#text/plain diff --git a/src/build/verinfo.c b/src/build/verinfo.c index 7afc00bf23a..fe692bbf4cf 100644 --- a/src/build/verinfo.c +++ b/src/build/verinfo.c @@ -18,6 +18,7 @@ typedef unsigned char UINT8; #define ARRAY_LENGTH(x) (sizeof(x) / sizeof(x[0])) #define BUILD_MAME (0) #define BUILD_MESS (1) +#define BUILD_UME (2) //============================================================ // TYPE DEFINITIONS @@ -172,7 +173,7 @@ static int parse_version(char *str, int *version_major, int *version_minor, int //============================================================ static int usage(char *me) { - fprintf(stderr, "Usage: %s [-b windows|winui|mess] <filename>\n", me); + fprintf(stderr, "Usage: %s [-b mame|mess|ume] <filename>\n", me); return 1; } @@ -204,6 +205,8 @@ int main(int argc, char *argv[]) build = BUILD_MAME; else if (!strcmp(p,"mess")) build = BUILD_MESS; + else if (!strcmp(p,"ume")) + build = BUILD_UME; else return usage(argv[0]); } @@ -263,6 +266,17 @@ int main(int argc, char *argv[]) v.original_filename = "MESS"; v.product_name = "MESS"; } + else if (build == BUILD_UME) + { + // UME + v.author = "MAME and MESS Team"; + v.comments = "Universal Machine Emulator"; + v.company_name = "MAME and MESS Team"; + v.file_description = "Universal Machine Emulator"; + v.internal_name = "UME"; + v.original_filename = "UME"; + v.product_name = "UME"; + } else { // MAME diff --git a/src/ume/osd/windows/ume.ico b/src/ume/osd/windows/ume.ico Binary files differnew file mode 100644 index 00000000000..d6062cffdf6 --- /dev/null +++ b/src/ume/osd/windows/ume.ico diff --git a/src/ume/osd/windows/ume.man b/src/ume/osd/windows/ume.man new file mode 100644 index 00000000000..3282441823b --- /dev/null +++ b/src/ume/osd/windows/ume.man @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="UME" type="win32" /> + <description>Universal Machine Emulator</description> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/src/ume/osd/windows/ume.rc b/src/ume/osd/windows/ume.rc new file mode 100644 index 00000000000..b96c1f5ebff --- /dev/null +++ b/src/ume/osd/windows/ume.rc @@ -0,0 +1,49 @@ +//============================================================ +// +// ume.rc - Minimal resource file for Win32 MAME +// +//============================================================ +// +// Copyright Aaron Giles +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or +// without modification, are permitted provided that the +// following conditions are met: +// +// * Redistributions of source code must retain the above +// copyright notice, this list of conditions and the +// following disclaimer. +// * Redistributions in binary form must reproduce the +// above copyright notice, this list of conditions and +// the following disclaimer in the documentation and/or +// other materials provided with the distribution. +// * Neither the name 'MAME' nor the names of its +// contributors may be used to endorse or promote +// products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, +// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGE (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +//============================================================ + +#define NOWINRES +#include "windows.h" +#include "commctrl.h" +#include "umevers.rc" + +1 24 MOVEABLE PURE "ume.man" + +2 ICON DISCARDABLE "ume.ico" diff --git a/src/ume/osd/windows/windows.mak b/src/ume/osd/windows/windows.mak new file mode 100644 index 00000000000..15fc95dba58 --- /dev/null +++ b/src/ume/osd/windows/windows.mak @@ -0,0 +1,41 @@ +########################################################################### +# +# windows.mak +# +# UME Windows-specific makefile +# +########################################################################### + +UME_WINSRC = src/ume/osd/windows +UME_WINOBJ = $(OBJ)/ume/osd/windows + +OBJDIRS += \ + $(UMEOBJ)/osd \ + $(UMEOBJ)/osd/windows + +RESFILE = $(UME_WINOBJ)/ume.res + +$(LIBOSD): $(OSDOBJS) + +$(LIBOCORE): $(OSDCOREOBJS) + +$(LIBOCORE_NOMAIN): $(OSDCOREOBJS:$(WINOBJ)/main.o=) + +#------------------------------------------------- +# generic rules for the resource compiler +#------------------------------------------------- + +$(UME_WINOBJ)/%.res: $(UME_WINSRC)/%.rc + @echo Compiling resources $<... + $(RC) $(RCDEFS) $(RCFLAGS) --include-dir $(UME_WINOBJ) -o $@ -i $< + + +#------------------------------------------------- +# rules for resource file +#------------------------------------------------- + +$(RESFILE): $(UME_WINSRC)/ume.rc $(UME_WINOBJ)/umevers.rc + +$(UME_WINOBJ)/umevers.rc: $(BUILDOUT)/verinfo$(BUILD_EXE) $(SRC)/version.c + @echo Emitting $@... + @"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b ume $(SRC)/version.c > $@
\ No newline at end of file diff --git a/src/ume/ume.mak b/src/ume/ume.mak index 1e7dd9b3507..c3471f8a5bf 100644 --- a/src/ume/ume.mak +++ b/src/ume/ume.mak @@ -14,7 +14,8 @@ CFLAGS += \ -I$(SRC)/mess/osd \ -I$(SRC)/mess/osd/$(OSD) -OBJDIRS += $(OBJ)/ume +UMEOBJ = $(OBJ)/ume +OBJDIRS += $(UMEOBJS) $(DRIVLISTSRC): $(SRC)/mame/mame.lst $(SRC)/mess/mess.lst |