Skip to content

Commit

Permalink
Update release version.
Browse files Browse the repository at this point in the history
Fix installer build on older VS versions.
Update copyright notices.
  • Loading branch information
dxgldotorg committed Jan 16, 2024
1 parent 69188a6 commit 4f776e2
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
6 changes: 4 additions & 2 deletions Installer/dxgl.nsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; DXGL
; Copyright (C) 2011-2021 William Feely
; Copyright (C) 2011-2024 William Feely

; This library is free software; you can redistribute it and/or
; modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -303,7 +303,7 @@ VIProductVersion "${PRODUCT_VERSION_NUMBER}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "DXGL ${PRODUCT_VERSION} Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "InternalName" "DXGL"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © 2011-2021 William Feely"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © 2011-2024 William Feely"
VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename" "DXGL-${PRODUCT_VERSION}-win32.exe"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "DXGL"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${PRODUCT_VERSION}"
Expand Down Expand Up @@ -417,7 +417,9 @@ Section "Fix DDraw COM registration" SEC_COMFIX
SectionEnd

Section /o "Debug symbols" SEC_DEBUGSYMBOLS
!if ${COMPILER} == "VC2022_8"
File "..\${SRCDIR}\cfgmgr.pdb"
!endif
File "..\${SRCDIR}\ddraw.pdb"
File "..\${SRCDIR}\dxglcfg.pdb"
SectionEnd
Expand Down
4 changes: 2 additions & 2 deletions buildtool/buildtool.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DXGL
// Copyright (C) 2012-2022 William Feely
// Copyright (C) 2012-2024 William Feely

// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -335,7 +335,7 @@ int ProcessHeaders(char *path)
version.build = 0;
version.major = 0;
version.minor = 5;
version.point = 20;
version.point = 21;
if (!GetGitVersion(path, &version)) ParseVersion(&version, TRUE);
else ParseVersion(&version, TRUE);
if (SIGNMODE < 1) nosign = TRUE;
Expand Down
4 changes: 2 additions & 2 deletions common/releasever.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* Removed due to transition to Git - Git tags will set the version number
#define DXGLMAJORVER 0
#define DXGLMINORVER 5
#define DXGLPOINTVER 20
#define DXGLPOINTVER 21
#define DXGLBETA 0
Expand All @@ -20,6 +20,6 @@
1 - sign non-beta only
2 - sign release only
3 - sign all */
#define SIGNMODE 1
#define SIGNMODE 0

#endif //__VERSION_H
2 changes: 1 addition & 1 deletion dxglcfg/dxglcfg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DXGL
// Copyright (C) 2011-2019 William Feely
// Copyright (C) 2011-2014 William Feely
// Portions copyright (C) 2018 Syahmi Azhar

// This library is free software; you can redistribute it and/or
Expand Down
4 changes: 2 additions & 2 deletions dxglcfg/dxglcfg.rc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DXGL
// Copyright (C) 2011-2021 William Feely
// Copyright (C) 2011-2024 William Feely

// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -671,7 +671,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
VALUE "FileDescription", "DXGL Configuration Program"
VALUE "FileVersion", "DXGLVERSTRING"
VALUE "InternalName", "DXGL"
VALUE "LegalCopyright", "Copyright � 2011-2020 William Feely"
VALUE "LegalCopyright", "Copyright � 2011-2024 William Feely"
VALUE "OriginalFilename", "dxglcfg.exe"
VALUE "ProductName", "DXGL"
VALUE "ProductVersion", "DXGLVERSTRING"
Expand Down

0 comments on commit 4f776e2

Please sign in to comment.