mirror of
https://github.com/nillerusr/source-engine.git
synced 2024-12-22 14:16:50 +00:00
Add cflags/ldflags, SDL version to engine.log
This commit is contained in:
parent
dde72b675b
commit
80c9ef37d7
@ -20,7 +20,6 @@ GNU General Public License for more details.
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <SDL_hints.h>
|
||||
#include <SDL_version.h>
|
||||
#include "tier0/dbg.h"
|
||||
#include "tier0/threadtools.h"
|
||||
|
||||
@ -29,7 +28,6 @@ char java_args[4096];
|
||||
int iLastArgs = 0;
|
||||
|
||||
DLL_EXPORT int LauncherMain( int argc, char **argv ); // from launcher.cpp
|
||||
extern void InitCrashHandler();
|
||||
|
||||
DLL_EXPORT int Java_com_valvesoftware_ValveActivity2_setenv(JNIEnv *jenv, jclass *jclass, jstring env, jstring value, jint over)
|
||||
{
|
||||
@ -120,18 +118,14 @@ void android_property_print(const char *name)
|
||||
|
||||
DLL_EXPORT int LauncherMainAndroid( int argc, char **argv )
|
||||
{
|
||||
SDL_version ver;
|
||||
SDL_GetVersion( &ver );
|
||||
Msg("GetTotalMemory() = %.2f \n", GetTotalMemory());
|
||||
|
||||
Msg("SDL version: %d.%d.%d rev: %s\n", (int)ver.major, (int)ver.minor, (int)ver.patch, SDL_GetRevision());
|
||||
Msg("GetTotalMemory() = %.2f GiB\n", GetTotalMemory());
|
||||
android_property_print("ro.build.version.sdk");
|
||||
android_property_print("ro.product.device");
|
||||
android_property_print("ro.product.manufacturer");
|
||||
android_property_print("ro.product.model");
|
||||
android_property_print("ro.product.name");
|
||||
|
||||
InitCrashHandler();
|
||||
SetLauncherArgs();
|
||||
|
||||
SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
|
||||
|
@ -67,7 +67,8 @@
|
||||
#endif
|
||||
|
||||
#if defined( USE_SDL )
|
||||
#include "SDL.h"
|
||||
#include <SDL.h>
|
||||
#include <SDL_version.h>
|
||||
|
||||
#if !defined( _WIN32 )
|
||||
#define MB_OK 0x00000001
|
||||
@ -1218,6 +1219,12 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
||||
|
||||
#endif // LINUX
|
||||
|
||||
#ifdef USE_SDL
|
||||
SDL_version ver;
|
||||
SDL_GetVersion( &ver );
|
||||
Msg("SDL version: %d.%d.%d rev: %s\n", (int)ver.major, (int)ver.minor, (int)ver.patch, SDL_GetRevision());
|
||||
#endif
|
||||
|
||||
#if defined LINUX && defined USE_SDL && defined TOGLES && !defined ANDROID
|
||||
SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1");
|
||||
#endif
|
||||
|
@ -13,6 +13,8 @@ def options(opt):
|
||||
|
||||
def configure(conf):
|
||||
conf.define('LAUNCHERONLY',1)
|
||||
conf.define('CFLAGS', conf.env.CFLAGS)
|
||||
conf.define('LDFLAGS', conf.env.LINKFLAGS)
|
||||
|
||||
def build(bld):
|
||||
source = [
|
||||
|
@ -114,6 +114,12 @@ void CDbgLogger::Init(const char *logfile)
|
||||
#else
|
||||
fprintf(file, ">>> Engine(arch:%s) started at %s\n", GetProcessorArchName(), szTime);
|
||||
#endif
|
||||
|
||||
#ifdef GNUC
|
||||
fprintf(file, "Compiler version: %s\n", __VERSION__);
|
||||
#endif
|
||||
fprintf(file, "Compiler CFLAGS: %s\n", WAF_CFLAGS);
|
||||
fprintf(file, "Compiler LDFLAGS: %s\n", WAF_LDFLAGS);
|
||||
fflush(file);
|
||||
|
||||
for( int i = 0; i < iMsg; i++ )
|
||||
|
@ -12,6 +12,8 @@ def options(opt):
|
||||
return
|
||||
|
||||
def configure(conf):
|
||||
conf.define('WAF_CFLAGS', conf.env.CFLAGS)
|
||||
conf.define('WAF_LDFLAGS', conf.env.LINKFLAGS)
|
||||
conf.define('TIER0_DLL_EXPORT',1)
|
||||
# conf.define('NO_HOOK_MALLOC',1)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user