LunaMoo
431e19977c
Merge branch 'master' into TemporaryHackishBranch
...
# Conflicts:
# Common/GPU/OpenGL/GLQueueRunner.cpp
# Common/GPU/OpenGL/GLRenderManager.h
# Common/GPU/OpenGL/thin3d_gl.cpp
# Common/GPU/Vulkan/VulkanRenderManager.cpp
# Common/GPU/Vulkan/thin3d_vulkan.cpp
# Common/UI/Context.cpp
# Core/Config.cpp
# Core/Config.h
# Core/HLE/proAdhoc.cpp
# Core/HLE/proAdhocServer.cpp
# Core/HLE/sceKernelThread.cpp
# Core/HLE/sceNet.cpp
# Core/HLE/sceNetAdhoc.cpp
# Core/Util/PPGeDraw.cpp
# GPU/Common/PresentationCommon.cpp
# GPU/Common/TextureCacheCommon.cpp
# GPU/GLES/TextureCacheGLES.cpp
# GPU/Vulkan/TextureCacheVulkan.cpp
# README.md
# UI/EmuScreen.cpp
# UI/GameSettingsScreen.cpp
# UI/NativeApp.cpp
# UI/ProfilerDraw.cpp
# Windows/git-version-gen.cmd
# ext/native/base/logging.h
2020-10-07 03:55:13 +02:00
Unknown W. Brackets
bf11829836
Windows: Avoid calling git describe 3 times.
...
We only need to call it once per build, which should save a little build
time. Of course, cl.exe takes longer, but still...
2020-05-23 16:56:27 -07:00
Unknown W. Brackets
9064bbcad1
Windows: Move git-version update to build event.
...
Doing it on each project made it possible for two to overwrite each other.
It's rare, but this could corrupt git-version.cpp.
This makes it run when Core is resolved, and also on Windows/Headless only.
It may still require two compiles to update, but that's not a new problem.
2020-05-23 13:34:41 -07:00
LunaMoo
7d31719e9e
Merge branch 'master' into TemporaryHackishBranch
2019-05-28 00:49:21 +02:00
driver1998
cdaa8d2609
fix git-version-gen on normal commits (without tag)
2019-05-13 19:05:57 +08:00
LunaMoo
c692279c34
Change name again.
2018-09-09 17:58:45 +02:00
LunaMoo
3f79e3e248
Just something to make certain girl smile while she plays Loco Roco
2018-07-21 04:01:46 +02:00
Henrik Rydgard
a1bf8573f6
Better way to find the git exe for git-version-gen, thanks Unknown.
2016-02-28 23:04:46 +01:00
Henrik Rydgard
de932b5efc
Make git-version-gen work with a freshly installed 64-bit git msys.
...
For some reason %ProgramFiles% returns the (x86) one anyway...
2016-02-28 11:03:54 +01:00
Henrik Rydgard
fa50afa056
Fix git-version-gen.cmd to handle even releases (git describe outputs a simpler format). Update lang.
2015-10-04 17:21:25 +02:00
Unknown W. Brackets
e6adf48c38
Fix a glitch when PPSSPP_GIT_VERSION_NO_UPDATE = 1.
...
Would cause the other version not to generate properly.
2015-08-24 21:07:11 -07:00
Unknown W. Brackets
c70d519e04
Search the GitHub Desktop git.exe path.
2015-08-16 14:20:09 -07:00
Unknown W. Brackets
4ddc12ce40
Generate windows version automatically.
...
This allows for the same customization git-version.cpp allows.
Also, improve messaging slightly during build if git is missing, and
disallow reporting for builds generated without version info to make it
clear to users.
2015-08-16 14:03:59 -07:00
Unknown W. Brackets
cd584df821
Fix git-version-gen.cmd when git.cmd is used.
2013-03-04 14:02:15 -08:00
Unknown W. Brackets
214a460eb9
Fix GIT env having quotes in it.
2013-03-03 02:21:34 -08:00
Unknown W. Brackets
fe16a70ea7
Add some instructions if it still doesn't work.
2013-03-03 02:18:24 -08:00
Unknown W. Brackets
66e4c4d824
Fix git-version-gen without git on path.
2013-03-03 02:17:32 -08:00
Henrik Rydgard
020e505e74
Make the gitversion script work automatically with msysgit without setting global PATH.
2013-03-03 10:57:00 +01:00
Unknown W. Brackets
35fe2b4a63
Actually use the git version.
...
Also switch to cpp, duh.
2013-03-02 12:42:25 -08:00
Unknown W. Brackets
96a22063e3
Add custom step for Windows for git-version.c.
2013-03-02 11:27:06 -08:00
LunaMoo