Skip to content

Commit 24a9a12

Browse files
chief1983chief1983
committed
Automated 3.7.4 Final versioning commit
1 parent c398a45 commit 24a9a12

File tree

16 files changed

+71
-71
lines changed

16 files changed

+71
-71
lines changed

‎code/fred2/fred.rc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ CAPTION "About FRED2"
621621
FONT 8, "MS Sans Serif"
622622
BEGIN
623623
ICON IDR_MAINFRAME,IDC_STATIC,10,17,20,20,SS_REALSIZEIMAGE
624-
LTEXT "FRED2_OPEN - FreeSpace Editor, Version 3.7.4 RC3 OpenGL",IDC_STATIC,39,8,184,10,SS_NOPREFIX
624+
LTEXT "FRED2_OPEN - FreeSpace Editor, Version 3.7.4 OpenGL",IDC_STATIC,39,8,184,10,SS_NOPREFIX
625625
LTEXT "Copyright � 1999 Volition, Inc. All Rights Reserved",IDC_STATIC,39,17,164,8
626626
DEFPUSHBUTTON "OK",IDOK,229,7,48,14,WS_GROUP
627627
LTEXT """Fred2 is the omega of all giant unwieldy pieces of code. Its big, its horrifying, and it just doesn't care. View it at your own risk."" - Dave Baranec",IDC_STATIC,39,62,238,20
@@ -2103,8 +2103,8 @@ END
21032103
//
21042104

21052105
VS_VERSION_INFO VERSIONINFO
2106-
FILEVERSION 3,7,4,20160627
2107-
PRODUCTVERSION 3,7,4,20160627
2106+
FILEVERSION 3,7,4,20160704
2107+
PRODUCTVERSION 3,7,4,20160704
21082108
FILEFLAGSMASK 0x3fL
21092109
#ifdef _DEBUG
21102110
FILEFLAGS 0x1L
@@ -2121,12 +2121,12 @@ BEGIN
21212121
BEGIN
21222122
VALUE "CompanyName", "Volition Inc."
21232123
VALUE "FileDescription", "Fred 2 Open"
2124-
VALUE "FileVersion", "3.7.4.20160627"
2124+
VALUE "FileVersion", "3.7.4.20160704"
21252125
VALUE "InternalName", "Fred 2 Open"
21262126
VALUE "LegalCopyright", "Copyright � 1998"
21272127
VALUE "OriginalFilename", "fred2.exe"
21282128
VALUE "ProductName", "Fred 2 Open"
2129-
VALUE "ProductVersion", "3.7.4 RC3"
2129+
VALUE "ProductVersion", "3.7.4"
21302130
END
21312131
END
21322132
BLOCK "VarFileInfo"
@@ -2698,7 +2698,7 @@ IDC_CURSOR2 CURSOR "res\\cursor2.cur"
26982698

26992699
STRINGTABLE
27002700
BEGIN
2701-
IDR_MAINFRAME "FRED2_OPEN 3.7.4 RC3 - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
2701+
IDR_MAINFRAME "FRED2_OPEN 3.7.4 - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
27022702
END
27032703

27042704
STRINGTABLE

‎code/freespace2/freespace.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ END
336336
//
337337

338338
VS_VERSION_INFO VERSIONINFO
339-
FILEVERSION 3,7,4,20160627
340-
PRODUCTVERSION 3,7,4,20160627
339+
FILEVERSION 3,7,4,20160704
340+
PRODUCTVERSION 3,7,4,20160704
341341
FILEFLAGSMASK 0x3fL
342342
#ifdef _DEBUG
343343
FILEFLAGS 0x1L
@@ -354,12 +354,12 @@ BEGIN
354354
BEGIN
355355
VALUE "CompanyName", "Volition Inc."
356356
VALUE "FileDescription", "FreeSpace 2 Open"
357-
VALUE "FileVersion", "3.7.4.20160627"
357+
VALUE "FileVersion", "3.7.4.20160704"
358358
VALUE "InternalName", "FreeSpace 2 Open"
359359
VALUE "LegalCopyright", "Copyright � 1998"
360360
VALUE "OriginalFilename", "fs2.exe"
361361
VALUE "ProductName", "FreeSpace 2 Open"
362-
VALUE "ProductVersion", "3.7.4 RC3"
362+
VALUE "ProductVersion", "3.7.4"
363363
END
364364
END
365365
BLOCK "VarFileInfo"

‎code/globalincs/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#define FS_VERSION_MAJOR 3 // major version
3838
#define FS_VERSION_MINOR 7 // increase by 1 for minor revs
3939
#define FS_VERSION_BUILD 4 // bugfix release
40-
#define FS_VERSION_REVIS 20160627 // SVN revision
40+
#define FS_VERSION_REVIS 20160704 // SVN revision
4141
//#define FS_VERSION_IDENT NOX("custom") // special build release identifier, must be a string (don't define unless it's supposed to be used!!)
4242

4343
namespace version

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl configure.ac for fs2_open
22
dnl
33
dnl $Id: configure.ac,v 1.31.2.4 2007-05-28 19:36:12 taylor Exp $
44

5-
AC_INIT(fs2_open, 3.7.4_RC3)
5+
AC_INIT(fs2_open, 3.7.4)
66
AC_CONFIG_SRCDIR(code/freespace2/freespace.cpp)
77

88
dnl we need at least version 2.54 of autoconf

‎projects/MSVC_2010/Fred2.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@
125125
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
126126
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
127127
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
128-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_7_4_RC3-DEBUG</TargetName>
129-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_7_4_RC3_SSE-DEBUG</TargetName>
130-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_7_4_RC3_SSE2-DEBUG</TargetName>
131-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_7_4_RC3</TargetName>
132-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_7_4_RC3_SSE</TargetName>
133-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_7_4_RC3_SSE2</TargetName>
128+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_7_4-DEBUG</TargetName>
129+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_7_4_SSE-DEBUG</TargetName>
130+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_7_4_SSE2-DEBUG</TargetName>
131+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_7_4</TargetName>
132+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_7_4_SSE</TargetName>
133+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_7_4_SSE2</TargetName>
134134
</PropertyGroup>
135135
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
136136
<CustomBuildStep>

‎projects/MSVC_2010/Freespace2.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@
124124
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
125125
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
126126
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
127-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_7_4_RC3-DEBUG</TargetName>
128-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_7_4_RC3_SSE-DEBUG</TargetName>
129-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_7_4_RC3_SSE2-DEBUG</TargetName>
130-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_7_4_RC3</TargetName>
131-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_7_4_RC3_SSE</TargetName>
132-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_7_4_RC3_SSE2</TargetName>
127+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_7_4-DEBUG</TargetName>
128+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_7_4_SSE-DEBUG</TargetName>
129+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_7_4_SSE2-DEBUG</TargetName>
130+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_7_4</TargetName>
131+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_7_4_SSE</TargetName>
132+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_7_4_SSE2</TargetName>
133133
</PropertyGroup>
134134
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
135135
<CustomBuildStep>

‎projects/MSVC_2010/wxFRED2.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<AdditionalDependencies>comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxmsw29ud_core.lib;wxbase29ud.lib</AdditionalDependencies>
101101
</Link>
102102
<CustomBuildStep>
103-
<Command>copy /y "$(TargetPath)" "$(FS2PATH)\wxfred2_open_3_7_4_RC3-debug.exe" </Command>
103+
<Command>copy /y "$(TargetPath)" "$(FS2PATH)\wxfred2_open_3_7_4-debug.exe" </Command>
104104
<Message>Copying build...</Message>
105105
<Outputs>$(FS2PATH)\wxfred2_open$(FS_VERSION_FULL)-debug.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
106106
</CustomBuildStep>
@@ -159,9 +159,9 @@
159159
<AdditionalDependencies>comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxmsw29u_core.lib;wxbase29u.lib</AdditionalDependencies>
160160
</Link>
161161
<CustomBuildStep>
162-
<Command>copy /y "$(TargetPath)" "$(FS2PATH)/wxfred2_open_3_7_4_RC3.exe"</Command>
162+
<Command>copy /y "$(TargetPath)" "$(FS2PATH)/wxfred2_open_3_7_4.exe"</Command>
163163
<Message>Copying build...</Message>
164-
<Outputs>$(FS2PATH)\wxfred2_open_3_7_4_RC3.exe;%(Outputs)</Outputs>
164+
<Outputs>$(FS2PATH)\wxfred2_open_3_7_4.exe;%(Outputs)</Outputs>
165165
</CustomBuildStep>
166166
</ItemDefinitionGroup>
167167
<ItemGroup>

‎projects/MSVC_2013/Fred2.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@
170170
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
171171
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
172172
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
173-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_7_4_RC3-DEBUG</TargetName>
174-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_7_4_RC3_SSE-DEBUG</TargetName>
175-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_7_4_RC3_SSE2-DEBUG</TargetName>
176-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'">fred2_open_3_7_4_RC3_AVX-DEBUG</TargetName>
177-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_7_4_RC3</TargetName>
178-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_7_4_RC3_SSE</TargetName>
179-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_7_4_RC3_SSE2</TargetName>
180-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'">fred2_open_3_7_4_RC3_AVX</TargetName>
173+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fred2_open_3_7_4-DEBUG</TargetName>
174+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fred2_open_3_7_4_SSE-DEBUG</TargetName>
175+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fred2_open_3_7_4_SSE2-DEBUG</TargetName>
176+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'">fred2_open_3_7_4_AVX-DEBUG</TargetName>
177+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fred2_open_3_7_4</TargetName>
178+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fred2_open_3_7_4_SSE</TargetName>
179+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fred2_open_3_7_4_SSE2</TargetName>
180+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'">fred2_open_3_7_4_AVX</TargetName>
181181
</PropertyGroup>
182182
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
183183
<CustomBuildStep />

‎projects/MSVC_2013/Freespace2.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@
169169
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
170170
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
171171
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
172-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_7_4_RC3-DEBUG</TargetName>
173-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_7_4_RC3_SSE-DEBUG</TargetName>
174-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_7_4_RC3_SSE2-DEBUG</TargetName>
175-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'">fs2_open_3_7_4_RC3_AVX-DEBUG</TargetName>
176-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_7_4_RC3</TargetName>
177-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_7_4_RC3_SSE</TargetName>
178-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_7_4_RC3_SSE2</TargetName>
179-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'">fs2_open_3_7_4_RC3_AVX</TargetName>
172+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fs2_open_3_7_4-DEBUG</TargetName>
173+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE|Win32'">fs2_open_3_7_4_SSE-DEBUG</TargetName>
174+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">fs2_open_3_7_4_SSE2-DEBUG</TargetName>
175+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'">fs2_open_3_7_4_AVX-DEBUG</TargetName>
176+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fs2_open_3_7_4</TargetName>
177+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE|Win32'">fs2_open_3_7_4_SSE</TargetName>
178+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">fs2_open_3_7_4_SSE2</TargetName>
179+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'">fs2_open_3_7_4_AVX</TargetName>
180180
</PropertyGroup>
181181
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
182182
<CustomBuildStep />

‎projects/MSVC_2013/wxFRED2.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@
9595
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28d_xrc.lib;wxmsw28d_html.lib;wxmsw28d_adv.lib;wxmsw28d_core.lib;wxbase28d_xml.lib;wxbase28d.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexd.lib;wxexpatd.lib;%(AdditionalDependencies)</AdditionalDependencies>
9696
</Link>
9797
<CustomBuildStep>
98-
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_7_4_RC3-debug.exe"
98+
<Command>copy %(FullPath) "$(FS2PATH)/wxfred2_open_3_7_4-debug.exe"
9999
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
100100
<Message>Copying build...</Message>
101-
<Outputs>$(FS2PATH)/wxfred2_open_3_7_4_RC3-debug.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
101+
<Outputs>$(FS2PATH)/wxfred2_open_3_7_4-debug.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
102102
</CustomBuildStep>
103103
</ItemDefinitionGroup>
104104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -146,10 +146,10 @@ copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Comma
146146
<AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;wxmsw28_xrc.lib;wxmsw28_html.lib;wxmsw28_adv.lib;wxmsw28_core.lib;wxbase28_xml.lib;wxbase28.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
147147
</Link>
148148
<CustomBuildStep>
149-
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_7_4_RC3.exe"
149+
<Command>copy %(FullPath) "$(FS2PATH)\wxfred2_open_3_7_4.exe"
150150
copy "$(ProjectDir)..\..\code\wxfred2\wxfred.xrc" "$(FS2PATH)\wxfred.xrc"</Command>
151151
<Message>Copying build...</Message>
152-
<Outputs>$(FS2PATH)\wxfred2_open_3_7_4_RC3.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
152+
<Outputs>$(FS2PATH)\wxfred2_open_3_7_4.exe;$(FS2PATH)\wxfred.xrc;%(Outputs)</Outputs>
153153
</CustomBuildStep>
154154
</ItemDefinitionGroup>
155155
<ItemGroup>

0 commit comments

Comments
 (0)