mirror of https://github.com/PCSX2/pcsx2.git
Merge pull request #682 from micove/Add_disable-build-date
Linux: Add DISABLE_BUILD_DATE and misc fixes
This commit is contained in:
Gregory Hainaut
commit
5c58bd2092
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh -e
|
||||
#!/bin/sh
|
||||
|
||||
# PCSX2 - PS2 Emulator for PCs
|
||||
# Copyright (C) 2002-2011 PCSX2 Dev Team
|
||||
|
|
@ -23,6 +23,8 @@
|
|||
# easiest solution it to ship library used during the build.
|
||||
# 3/ Set __GL_THREADED_OPTIMIZATIONS variable for Nvidia Drivers (major speed boost)
|
||||
|
||||
set -e
|
||||
|
||||
current_script=$0
|
||||
me=PCSX2-linux.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,19 @@
|
|||
# Misc option
|
||||
#-------------------------------------------------------------------------------
|
||||
option(DISABLE_SVU "Disable superVU (don't use it)")
|
||||
option(DISABLE_BUILD_DATE "Disable including the binary compile date")
|
||||
|
||||
if(DISABLE_BUILD_DATE OR openSUSE)
|
||||
message(STATUS "Disabling the inclusion of the binary compile date.")
|
||||
add_definitions(-DDISABLE_BUILD_DATE)
|
||||
endif()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Graphical option
|
||||
#-------------------------------------------------------------------------------
|
||||
option(GLSL_API "Replace zzogl CG backend by GLSL (experimental option)")
|
||||
option(EGL_API "Use EGL on zzogl (experimental/developer option)")
|
||||
option(REBUILD_SHADER "Rebuild glsl/cg shader (developer option)")
|
||||
option(GLSL_API "Replace ZZogl CG backend by GLSL (experimental option)")
|
||||
option(EGL_API "Use EGL on ZZogl/GSdx (experimental/developer option)")
|
||||
option(REBUILD_SHADER "Rebuild GLSL/CG shader (developer option)")
|
||||
option(BUILD_REPLAY_LOADERS "Build GS replayer to ease testing (developer option)")
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ function(detectOperatingSystem)
|
|||
message(STATUS "Build Fedora specific")
|
||||
elseif("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$")
|
||||
set(openSUSE TRUE PARENT_SCOPE)
|
||||
add_definitions(-DopenSUSE)
|
||||
message(STATUS "Build openSUSE specific")
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
#-------------------------------------------------------------------------------
|
||||
## Use cmake package to find module
|
||||
find_package(ALSA)
|
||||
find_package(BZip2)
|
||||
find_package(Gettext) # translation tool
|
||||
find_package(Git)
|
||||
find_package(JPEG)
|
||||
if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
|
||||
find_package(Git)
|
||||
endif()
|
||||
find_package(LibLZMA)
|
||||
find_package(PNG)
|
||||
find_package(OpenGL)
|
||||
find_package(PNG)
|
||||
# The requirement of wxWidgets is checked in SelectPcsx2Plugins module
|
||||
# Does not require the module (allow to compile non-wx plugins)
|
||||
# Force the unicode build (the variable is only supported on cmake 2.8.3 and above)
|
||||
|
|
@ -62,16 +62,24 @@ find_package(wxWidgets COMPONENTS base core adv)
|
|||
find_package(ZLIB)
|
||||
|
||||
## Use pcsx2 package to find module
|
||||
include(FindCg)
|
||||
include(FindGlew)
|
||||
include(FindLibc)
|
||||
|
||||
## Only needed by the extra plugins
|
||||
if(EXTRA_PLUGINS)
|
||||
find_package(BZip2)
|
||||
include(FindCg)
|
||||
include(FindGlew)
|
||||
find_package(JPEG)
|
||||
endif()
|
||||
|
||||
## Use CheckLib package to find module
|
||||
include(CheckLib)
|
||||
if(Linux)
|
||||
check_lib(AIO aio libaio.h)
|
||||
endif()
|
||||
check_lib(EGL EGL EGL/egl.h)
|
||||
if(EGL_API)
|
||||
check_lib(EGL EGL EGL/egl.h)
|
||||
endif()
|
||||
check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
|
||||
check_lib(SOUNDTOUCH SoundTouch soundtouch/SoundTouch.h)
|
||||
check_lib(PNGPP FALSE png++/png.hpp)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh -e
|
||||
#!/bin/sh
|
||||
|
||||
# PCSX2 - PS2 Emulator for PCs
|
||||
# Copyright (C) 2002-2014 PCSX2 Dev Team
|
||||
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
# This script call xgettext utility to generate some nice pot (translation template) files
|
||||
|
||||
set -e
|
||||
|
||||
######################################################################
|
||||
# Script configuration
|
||||
######################################################################
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ void SysLogMachineCaps()
|
|||
if ( !PCSX2_isReleaseVersion )
|
||||
{
|
||||
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld %s"
|
||||
#ifndef openSUSE
|
||||
#ifndef DISABLE_BUILD_DATE
|
||||
"- compiled on " __DATE__
|
||||
#endif
|
||||
, PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
|
|
@ -205,7 +205,7 @@ void SysLogMachineCaps()
|
|||
}
|
||||
else { // shorter release version string
|
||||
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld"
|
||||
#ifndef openSUSE
|
||||
#ifndef DISABLE_BUILD_DATE
|
||||
"- compiled on " __DATE__
|
||||
#endif
|
||||
, PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
|
|||
else
|
||||
{
|
||||
// beta / development editions, which feature revision number and compile date.
|
||||
#ifndef openSUSE
|
||||
#ifndef DISABLE_BUILD_DATE
|
||||
wintitle.Printf( L"%s %d.%d.%d-%lld%s (git) %s", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
SVN_REV, SVN_MODS ? L"m" : wxEmptyString, fromUTF8(__DATE__).c_str() );
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
** Contrast, saturation, brightness
|
||||
** Code of this function is from TGM's shader pack
|
||||
** http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=21057
|
||||
** TGM's author comment about the license (included in the previous link)
|
||||
** "do with it, what you want! its total free!
|
||||
** (but would be nice, if you say that you used my shaders :wink: ) but not necessary"
|
||||
*/
|
||||
|
||||
struct vertex_basic
|
||||
|
|
|
|||
Loading…
Reference in New Issue