Update Windows resource and version.h.in files
This commit is contained in:
scribam
flyinghead
parent
d6e15544bc
commit
57ae9022dd
|
|
@ -950,7 +950,7 @@ elseif(WIN32)
|
|||
endif()
|
||||
target_sources(${PROJECT_NAME} PRIVATE
|
||||
core/windows/win_vmem.cpp
|
||||
shell/windows/reicast.rc)
|
||||
shell/windows/flycast.rc)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE dsound opengl32 winmm ws2_32 wsock32 xinput9_1_0)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ RZDCY_FILES += $(LIBZIP_DIR)/zip_add.c \
|
|||
endif
|
||||
|
||||
$(VERSION_HEADER):
|
||||
echo "#define REICAST_VERSION \"`git describe --tags --always`\"" > $(VERSION_HEADER)
|
||||
echo "#define GIT_VERSION \"`git describe --tags --always`\"" > $(VERSION_HEADER)
|
||||
echo "#define GIT_HASH \"`git rev-parse --short HEAD`\"" >> $(VERSION_HEADER)
|
||||
echo "#define BUILD_DATE \"`date '+%Y-%m-%d %H:%M:%S %Z'`\"" >> $(VERSION_HEADER)
|
||||
|
||||
|
|
|
|||
|
|
@ -1580,7 +1580,7 @@ static void gui_display_settings()
|
|||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, normal_padding);
|
||||
if (ImGui::CollapsingHeader("Flycast", ImGuiTreeNodeFlags_DefaultOpen))
|
||||
{
|
||||
ImGui::Text("Version: %s", REICAST_VERSION);
|
||||
ImGui::Text("Version: %s", GIT_VERSION);
|
||||
ImGui::Text("Git Hash: %s", GIT_HASH);
|
||||
ImGui::Text("Build Date: %s", BUILD_DATE);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
/*
|
||||
* reicast: version.h
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#define REICAST_VERSION "@GIT_VERSION@"
|
||||
#define GIT_VERSION "@GIT_VERSION@"
|
||||
#define GIT_HASH "@GIT_HASH@"
|
||||
#define BUILD_DATE "@BUILD_TIMESTAMP@"
|
||||
|
|
@ -2594,7 +2594,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "echo \"#define REICAST_VERSION \\\"`git describe --tags --always`\\\"\" > $SRCROOT/../../../core/version.h\necho \"#define GIT_HASH \\\"`git rev-parse --short HEAD`\\\"\" >> $SRCROOT/../../../core/version.h\necho \"#define BUILD_DATE \\\"`date '+%Y-%m-%d %H:%M:%S %Z'`\\\"\" >> $SRCROOT/../../../core/version.h\ncd $SRCROOT/../../../core/deps/miniupnpc; sh ./updateminiupnpcstrings.sh\n";
|
||||
shellScript = "echo \"#define GIT_VERSION \\\"`git describe --tags --always`\\\"\" > $SRCROOT/../../../core/version.h\necho \"#define GIT_HASH \\\"`git rev-parse --short HEAD`\\\"\" >> $SRCROOT/../../../core/version.h\necho \"#define BUILD_DATE \\\"`date '+%Y-%m-%d %H:%M:%S %Z'`\\\"\" >> $SRCROOT/../../../core/version.h\ncd $SRCROOT/../../../core/deps/miniupnpc; sh ./updateminiupnpcstrings.sh\n";
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
|
|
|
|||
|
|
@ -482,8 +482,8 @@ OBJECTS:=$(OBJECTS:.S=.build_obj)
|
|||
OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,$(BUILDDIR)/%,$(OBJECTS))
|
||||
|
||||
ifdef FOR_WINDOWS
|
||||
OBJECTS += $(BUILDDIR)/reicastres.build_obj
|
||||
$(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/flycast.ico $(RZDCY_SRC_DIR)/version.h
|
||||
OBJECTS += $(BUILDDIR)/flycastres.build_obj
|
||||
$(BUILDDIR)/flycastres.build_obj: $(LOCAL_PATH)/../windows/flycast.rc $(LOCAL_PATH)/../windows/flycast.ico $(RZDCY_SRC_DIR)/version.h
|
||||
$(WINDRES) $< $@
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
#include "../../core/version.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDI_ICON1 ICON "flycast.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,0,0
|
||||
PRODUCTVERSION 1,0,0,0
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904E4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Flycast Team"
|
||||
VALUE "FileDescription", "Flycast"
|
||||
VALUE "FileVersion", REICAST_VERSION
|
||||
VALUE "InternalName", "reicast"
|
||||
VALUE "LegalCopyright", "Copyright (c) Reicast contributors. All rights reserved."
|
||||
VALUE "OriginalFilename", "flycast.exe"
|
||||
VALUE "ProductName", "Flycast"
|
||||
VALUE "ProductVersion", REICAST_VERSION
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1252
|
||||
END
|
||||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
#include "../../core/version.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDI_ICON1 ICON "flycast.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,0,0
|
||||
PRODUCTVERSION 1,0,0,0
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904E4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Flycast Team"
|
||||
VALUE "FileDescription", "Flycast is a multiplatform Sega Dreamcast, Naomi and Atomiswave emulator"
|
||||
VALUE "FileVersion", GIT_VERSION
|
||||
VALUE "InternalName", "flycast"
|
||||
VALUE "LegalCopyright", "Copyright various authors. Released under the GNU General Public License."
|
||||
VALUE "OriginalFilename", "flycast.exe"
|
||||
VALUE "ProductName", "Flycast"
|
||||
VALUE "ProductVersion", GIT_VERSION
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1252
|
||||
END
|
||||
END
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
//{{NO_DEPENDENCIES}}
|
||||
// Microsoft Visual C++ generated include file.
|
||||
// Used by reicast.rc
|
||||
// Used by flycast.rc
|
||||
//
|
||||
#define IDI_ICON1 105
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue