(MESS) fixed resource data of Windows executable [Oliver Stöneberg]

This commit is contained in:
Oliver Stöneberg 2012-09-17 19:49:37 +00:00
parent 5fbd9e230c
commit 6bc58a69ab
6 changed files with 30 additions and 24 deletions

1
.gitattributes vendored
View File

@ -7222,6 +7222,7 @@ src/mess/mess.lst svneol=native#text/plain
src/mess/mess.mak svneol=native#text/plain src/mess/mess.mak svneol=native#text/plain
src/mess/messcore.mak svneol=native#text/plain src/mess/messcore.mak svneol=native#text/plain
src/mess/osd/windows/mess.ico -text src/mess/osd/windows/mess.ico -text
src/mess/osd/windows/mess.man svneol=CRLF#text/plain eol=crlf
src/mess/osd/windows/mess.rc svneol=native#text/plain src/mess/osd/windows/mess.rc svneol=native#text/plain
src/mess/osd/windows/windows.mak svneol=native#text/plain src/mess/osd/windows/windows.mak svneol=native#text/plain
src/mess/tiny.lst svneol=native#text/plain src/mess/tiny.lst svneol=native#text/plain

View File

@ -16,9 +16,8 @@
typedef unsigned char UINT8; typedef unsigned char UINT8;
#define ARRAY_LENGTH(x) (sizeof(x) / sizeof(x[0])) #define ARRAY_LENGTH(x) (sizeof(x) / sizeof(x[0]))
#define BUILD_WINDOWS (0) #define BUILD_MAME (0)
#define BUILD_WINUI (1) #define BUILD_MESS (1)
#define BUILD_MESS (2)
//============================================================ //============================================================
// TYPE DEFINITIONS // TYPE DEFINITIONS
@ -192,7 +191,7 @@ int main(int argc, char *argv[])
FILE *f; FILE *f;
memset(&v, 0, sizeof(v)); memset(&v, 0, sizeof(v));
build = BUILD_WINDOWS; build = BUILD_MAME;
// validate parameters // validate parameters
opt = 1; opt = 1;
@ -201,10 +200,8 @@ int main(int argc, char *argv[])
if (!strcmp(argv[opt], "-b")) if (!strcmp(argv[opt], "-b"))
{ {
char *p = argv[++opt]; char *p = argv[++opt];
if (!strcmp(p,"windows")) if (!strcmp(p,"mame"))
build = BUILD_WINDOWS; build = BUILD_MAME;
else if (!strcmp(p,"winui"))
build = BUILD_WINUI;
else if (!strcmp(p,"mess")) else if (!strcmp(p,"mess"))
build = BUILD_MESS; build = BUILD_MESS;
else else
@ -266,17 +263,6 @@ int main(int argc, char *argv[])
v.original_filename = "MESS"; v.original_filename = "MESS";
v.product_name = "MESS"; v.product_name = "MESS";
} }
else if (build == BUILD_WINUI)
{
// MAMEUI
v.author = "Christopher Kirmse and the MAMEUI team";
v.comments = "Multiple Arcade Machine Emulator with GUI";
v.company_name = "MAME Team";
v.file_description = "Multiple Arcade Machine Emulator with GUI";
v.internal_name = "MAMEUI";
v.original_filename = "MAMEUI";
v.product_name = "MAMEUI";
}
else else
{ {
// MAME // MAME

View File

@ -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="MESS" type="win32" />
<description>Multi Emulator Super System</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
</dependentAssembly>
</dependency>
</assembly>

View File

@ -1,6 +1,6 @@
//============================================================ //============================================================
// //
// mame.rc - Minimal resource file for Win32 MAME // mess.rc - Minimal resource file for Win32 MAME
// //
//============================================================ //============================================================
// //
@ -44,6 +44,6 @@
#include "commctrl.h" #include "commctrl.h"
#include "mamevers.rc" #include "mamevers.rc"
1 24 MOVEABLE PURE "mame.man" 1 24 MOVEABLE PURE "mess.man"
2 ICON DISCARDABLE "mess.ico" 2 ICON DISCARDABLE "mess.ico"

View File

@ -21,8 +21,6 @@ $(LIBOCORE): $(OSDCOREOBJS)
$(LIBOCORE_NOMAIN): $(OSDCOREOBJS:$(WINOBJ)/main.o=) $(LIBOCORE_NOMAIN): $(OSDCOREOBJS:$(WINOBJ)/main.o=)
$(RESFILE): $(MESS_WINSRC)/mess.rc $(WINOBJ)/mamevers.rc
#------------------------------------------------- #-------------------------------------------------
# generic rules for the resource compiler # generic rules for the resource compiler
#------------------------------------------------- #-------------------------------------------------
@ -30,3 +28,14 @@ $(RESFILE): $(MESS_WINSRC)/mess.rc $(WINOBJ)/mamevers.rc
$(MESS_WINOBJ)/%.res: $(MESS_WINSRC)/%.rc $(MESS_WINOBJ)/%.res: $(MESS_WINSRC)/%.rc
@echo Compiling resources $<... @echo Compiling resources $<...
$(RC) $(RCDEFS) $(RCFLAGS) --include-dir mess/$(OSD) -o $@ -i $< $(RC) $(RCDEFS) $(RCFLAGS) --include-dir mess/$(OSD) -o $@ -i $<
#-------------------------------------------------
# rules for resource file
#-------------------------------------------------
$(RESFILE): $(MESS_WINSRC)/mess.rc $(WINOBJ)/messvers.rc
$(WINOBJ)/messvers.rc: $(BUILDOUT)/verinfo$(BUILD_EXE) $(SRC)/version.c
@echo Emitting $@...
@"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b mess $(SRC)/version.c > $@

View File

@ -377,4 +377,4 @@ $(RESFILE): $(WINSRC)/mame.rc $(WINOBJ)/mamevers.rc
$(WINOBJ)/mamevers.rc: $(BUILDOUT)/verinfo$(BUILD_EXE) $(SRC)/version.c $(WINOBJ)/mamevers.rc: $(BUILDOUT)/verinfo$(BUILD_EXE) $(SRC)/version.c
@echo Emitting $@... @echo Emitting $@...
@"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b windows $(SRC)/version.c > $@ @"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b mame $(SRC)/version.c > $@