Skip to content

Commit d218a6e

Browse files
committed
Slight build tweaks for initial release
1 parent 648648e commit d218a6e

3 files changed

Lines changed: 33 additions & 5 deletions

File tree

EditorPhysics/PhysX.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<PropertyGroup />
66
<ItemDefinitionGroup>
77
<ClCompile>
8-
<AdditionalIncludeDirectories>$(SolutionDir)..\..\3rdParty\PhysX\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8+
<AdditionalIncludeDirectories>$(SolutionDir)\3rdParty\PhysX\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
99
</ClCompile>
1010
<Link>
11-
<AdditionalLibraryDirectories>$(SolutionDir)..\..\3rdParty\PhysX\Lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
11+
<AdditionalLibraryDirectories>$(SolutionDir)\3rdParty\PhysX\Lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
1212
<AdditionalDependencies>PxFoundation_$(PlatformTarget).lib;PhysX3_$(PlatformTarget).lib;PhysX3Cooking_$(PlatformTarget).lib;%(AdditionalDependencies)</AdditionalDependencies>
1313
</Link>
1414
</ItemDefinitionGroup>

FontStash/FontStash.vcxproj

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,35 @@ copy /B /Y "$(TargetPath)" "$(SolutionDir)OverloadLevelEditor\bin\$(Configuratio
173173
<EnableCOMDATFolding>true</EnableCOMDATFolding>
174174
<OptimizeReferences>true</OptimizeReferences>
175175
<GenerateDebugInformation>true</GenerateDebugInformation>
176-
<AdditionalLibraryDirectories>../../3rdParty/glew-1.13.0/lib/Release MX/x64</AdditionalLibraryDirectories>
176+
<AdditionalLibraryDirectories>..\packages\glew_mx.11.1.0.1\build\native\lib\v120\x64\Release\static</AdditionalLibraryDirectories>
177+
<AdditionalDependencies>opengl32.lib;glew.lib;%(AdditionalDependencies)</AdditionalDependencies>
178+
<ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
179+
</Link>
180+
<PostBuildEvent>
181+
<Command>mkdir "$(SolutionDir)OverloadLevelEditor\bin\x64\$(ConfigurationName)"
182+
copy /B /Y "$(TargetPath)" "$(SolutionDir)OverloadLevelEditor\bin\x64\$(ConfigurationName)"</Command>
183+
</PostBuildEvent>
184+
<PostBuildEvent>
185+
<Message>Copy to build folder</Message>
186+
</PostBuildEvent>
187+
</ItemDefinitionGroup>
188+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PublicRelease|x64'">
189+
<ClCompile>
190+
<WarningLevel>Level3</WarningLevel>
191+
<PrecompiledHeader>
192+
</PrecompiledHeader>
193+
<Optimization>MaxSpeed</Optimization>
194+
<FunctionLevelLinking>true</FunctionLevelLinking>
195+
<IntrinsicFunctions>true</IntrinsicFunctions>
196+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;FONTSTASH_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
197+
<AdditionalIncludeDirectories>../../3rdParty/glew-1.13.0/include</AdditionalIncludeDirectories>
198+
</ClCompile>
199+
<Link>
200+
<SubSystem>Windows</SubSystem>
201+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
202+
<OptimizeReferences>true</OptimizeReferences>
203+
<GenerateDebugInformation>true</GenerateDebugInformation>
204+
<AdditionalLibraryDirectories>..\packages\glew_mx.11.1.0.1\build\native\lib\v120\x64\Release\static</AdditionalLibraryDirectories>
177205
<AdditionalDependencies>opengl32.lib;glew.lib;%(AdditionalDependencies)</AdditionalDependencies>
178206
<ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
179207
</Link>

OverloadLevelEditor/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
4646
// by using the '*' as shown below:
4747
// [assembly: AssemblyVersion("1.0.*")]
4848
[assembly: AssemblyVersion("1.0.0.0")] // ONLY CHANGE THIS VERSION IF THE API HAS CHANGED -- WHEN YOU CHANGE THIS VERSION IT WILL BREAK APPS THAT REFERENCE (This is the only version number .NET uses)
49-
[assembly: AssemblyFileVersion("1.0.1.0")] // This is used to uniquely identify a specific build of this assembly (you might encode the Perforce changelist into this if you were inclined)
50-
[assembly: AssemblyInformationalVersion("1.0.1.0")] // !!! THIS IS THE VERSION THAT WINDOWS USES TO DISPLAY THE VERSION INFO (of the entire product) - like from file Explorer - this is the "ProductVersion"
49+
[assembly: AssemblyFileVersion("1.1.0.0")] // This is used to uniquely identify a specific build of this assembly (you might encode the Perforce changelist into this if you were inclined)
50+
[assembly: AssemblyInformationalVersion("1.1.0.0")] // !!! THIS IS THE VERSION THAT WINDOWS USES TO DISPLAY THE VERSION INFO (of the entire product) - like from file Explorer - this is the "ProductVersion"

0 commit comments

Comments
 (0)