diff --git a/.gitignore b/.gitignore index 68efcecbc..2e9679de0 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ mm/libultraship/extern/StrHash64.dir/Debug/StrHash64.tlog/Lib.command.1.tlog /x64 /mm/src/boot/build.c +/mm/windows/properties.h diff --git a/mm/CMakeLists.txt b/mm/CMakeLists.txt index 96f99eb80..0fd32c57a 100644 --- a/mm/CMakeLists.txt +++ b/mm/CMakeLists.txt @@ -106,7 +106,7 @@ set(PROJECT_NAME mm) # Sources ################################################################################ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/src/boot/build.c.in ${CMAKE_CURRENT_SOURCE_DIR}/src/boot/build.c @ONLY) -#configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/src/boot/properties.h.in ${CMAKE_CURRENT_SOURCE_DIR}/properties.h @ONLY) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/windows/properties.h.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/properties.h @ONLY) #set(Header_Files "resource.h") source_group("headers" FILES ${Header_Files}) @@ -237,8 +237,10 @@ source_group("2s2h\\resource\\importer\\scenecommand" REGULAR_EXPRESSION "2s2h/r # src (decomp) {{{ file(GLOB_RECURSE src__ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.c" "src/*.h") -#list(APPEND src__ ${CMAKE_CURRENT_SOURCE_DIR}/properties.h) -#list(APPEND src__ ${CMAKE_CURRENT_SOURCE_DIR}/Resource.rc) +if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + list(APPEND src__ ${CMAKE_CURRENT_SOURCE_DIR}/windows/Resource.rc) +endif() + list(FILTER src__ EXCLUDE REGEX "src/dmadata/*") list(FILTER src__ EXCLUDE REGEX "src/elf_message/*") list(FILTER src__ EXCLUDE REGEX "src/libultra/io/*") diff --git a/mm/windows/2SHIP2HARKINIAN.ico b/mm/windows/2SHIP2HARKINIAN.ico new file mode 100644 index 000000000..505d55d29 Binary files /dev/null and b/mm/windows/2SHIP2HARKINIAN.ico differ diff --git a/mm/windows/2SHIP2HARKINIAN.manifest b/mm/windows/2SHIP2HARKINIAN.manifest new file mode 100644 index 000000000..6f47a937f --- /dev/null +++ b/mm/windows/2SHIP2HARKINIAN.manifest @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + true/pm + permonitorv2,permonitor + + + diff --git a/mm/windows/Resource.rc b/mm/windows/Resource.rc new file mode 100644 index 000000000..ec1acd871 --- /dev/null +++ b/mm/windows/Resource.rc @@ -0,0 +1,114 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" +#include "properties.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// Version Info +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VER_FILEVERSION + PRODUCTVERSION VER_PRODUCTVERSION + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", VER_PRODUCTVERSION_str + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "2SHIP2HARKINIAN.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST +// + +1 RT_MANIFEST "2SHIP2HARKINIAN.manifest" + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/mm/windows/properties.h.in b/mm/windows/properties.h.in new file mode 100644 index 000000000..ef3141f46 --- /dev/null +++ b/mm/windows/properties.h.in @@ -0,0 +1,14 @@ + +#define VER_FILEVERSION @CMAKE_PROJECT_VERSION_MAJOR@, @CMAKE_PROJECT_VERSION_MINOR@, @CMAKE_PROJECT_VERSION_PATCH@, 0 +#define VER_FILEVERSION_STR "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@\0" + +#define VER_PRODUCTVERSION @CMAKE_PROJECT_VERSION_MAJOR@, @CMAKE_PROJECT_VERSION_MINOR@, @CMAKE_PROJECT_VERSION_PATCH@, 0 +#define VER_PRODUCTVERSION_str "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@\0" + +#define VER_COMPANYNAME_STR "@PROJECT_TEAM@\0" +#define VER_PRODUCTNAME_STR "2 Ship 2 Harkinian\0" + +#define VER_INTERNALNAME_STR "@PROJECT_NAME@\0" +#define VER_ORIGINALFILENAME_STR "@PROJECT_NAME@.exe\0" + +#define VER_FILEDESCRIPTION_STR "2 Ship 2 Harkinian - @PROJECT_BUILD_NAME@\0" diff --git a/mm/windows/resource.h b/mm/windows/resource.h new file mode 100644 index 000000000..8a193b3e8 --- /dev/null +++ b/mm/windows/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Resource.rc +// +#define IDI_ICON1 111 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 113 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif