From 7d4826682e5002b51a35765d95e579a4486f1591 Mon Sep 17 00:00:00 2001 From: g-cont Date: Sun, 28 Nov 2010 00:00:00 +0300 Subject: [PATCH] 28 Nov 2010 --- engine/engine.plg | 154 ++++++++++++++++++++++++++++++++++++++++++++ launch/launch.h | 8 +-- launch/system.c | 12 ++-- mainui/mainui.plg | 16 +++++ public/launch_api.h | 12 ++-- 5 files changed, 183 insertions(+), 19 deletions(-) create mode 100644 engine/engine.plg create mode 100644 mainui/mainui.plg diff --git a/engine/engine.plg b/engine/engine.plg new file mode 100644 index 00000000..4595c749 --- /dev/null +++ b/engine/engine.plg @@ -0,0 +1,154 @@ + + +
+
Build Log

+

+--------------------Configuration: engine - Win32 Debug--------------------
+

+
Command Lines

+Creating temporary file "C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSP2A8.tmp" with contents
+[
+/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "./" /I "common" /I "server" /I "client" /I "client/sound" /I "../public" /I "../common" /I "../game_shared" /I "../pm_shared" /I "../utils/vgui/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"..\temp\engine\!debug/" /Fo"..\temp\engine\!debug/" /Fd"..\temp\engine\!debug/" /FD /c 
+"D:\Xash3D\src_main\engine\common\avikit.c"
+"D:\Xash3D\src_main\engine\common\build.c"
+"D:\Xash3D\src_main\engine\client\cl_beam.c"
+"D:\Xash3D\src_main\engine\client\cl_cmds.c"
+"D:\Xash3D\src_main\engine\client\cl_demo.c"
+"D:\Xash3D\src_main\engine\client\cl_frame.c"
+"D:\Xash3D\src_main\engine\client\cl_game.c"
+"D:\Xash3D\src_main\engine\client\cl_main.c"
+"D:\Xash3D\src_main\engine\client\cl_menu.c"
+"D:\Xash3D\src_main\engine\client\cl_parse.c"
+"D:\Xash3D\src_main\engine\client\cl_part.c"
+"D:\Xash3D\src_main\engine\client\cl_pmove.c"
+"D:\Xash3D\src_main\engine\client\cl_pred.c"
+"D:\Xash3D\src_main\engine\client\cl_scrn.c"
+"D:\Xash3D\src_main\engine\client\cl_studio.c"
+"D:\Xash3D\src_main\engine\client\cl_tent.c"
+"D:\Xash3D\src_main\engine\client\cl_video.c"
+"D:\Xash3D\src_main\engine\client\cl_view.c"
+"D:\Xash3D\src_main\engine\common\con_utils.c"
+"D:\Xash3D\src_main\engine\common\console.c"
+"D:\Xash3D\src_main\engine\common\engfuncs.c"
+"D:\Xash3D\src_main\engine\client\gl_rsurf.c"
+"D:\Xash3D\src_main\engine\common\host.c"
+"D:\Xash3D\src_main\engine\common\infostring.c"
+"D:\Xash3D\src_main\engine\common\input.c"
+"D:\Xash3D\src_main\engine\common\keys.c"
+"D:\Xash3D\src_main\engine\common\mathlib.c"
+"D:\Xash3D\src_main\engine\common\model.c"
+"D:\Xash3D\src_main\engine\common\net_buffer.c"
+"D:\Xash3D\src_main\engine\common\net_chan.c"
+"D:\Xash3D\src_main\engine\common\net_encode.c"
+"D:\Xash3D\src_main\engine\common\net_huff.c"
+"D:\Xash3D\src_main\engine\common\pm_studio.c"
+"D:\Xash3D\src_main\engine\common\pm_surface.c"
+"D:\Xash3D\src_main\engine\common\pm_trace.c"
+"D:\Xash3D\src_main\engine\common\portals.c"
+"D:\Xash3D\src_main\engine\client\sound\s_backend.c"
+"D:\Xash3D\src_main\engine\client\sound\s_dsp.c"
+"D:\Xash3D\src_main\engine\client\sound\s_load.c"
+"D:\Xash3D\src_main\engine\client\sound\s_main.c"
+"D:\Xash3D\src_main\engine\client\sound\s_mix.c"
+"D:\Xash3D\src_main\engine\client\sound\s_mouth.c"
+"D:\Xash3D\src_main\engine\client\sound\s_stream.c"
+"D:\Xash3D\src_main\engine\client\sound\s_utils.c"
+"D:\Xash3D\src_main\engine\client\sound\s_vox.c"
+"D:\Xash3D\src_main\engine\server\sv_client.c"
+"D:\Xash3D\src_main\engine\server\sv_cmds.c"
+"D:\Xash3D\src_main\engine\server\sv_custom.c"
+"D:\Xash3D\src_main\engine\server\sv_frame.c"
+"D:\Xash3D\src_main\engine\server\sv_game.c"
+"D:\Xash3D\src_main\engine\server\sv_init.c"
+"D:\Xash3D\src_main\engine\server\sv_main.c"
+"D:\Xash3D\src_main\engine\server\sv_move.c"
+"D:\Xash3D\src_main\engine\server\sv_phys.c"
+"D:\Xash3D\src_main\engine\server\sv_pmove.c"
+"D:\Xash3D\src_main\engine\server\sv_save.c"
+"D:\Xash3D\src_main\engine\server\sv_studio.c"
+"D:\Xash3D\src_main\engine\server\sv_world.c"
+"D:\Xash3D\src_main\engine\common\titles.c"
+"D:\Xash3D\src_main\engine\common\vgui_int.cpp"
+"D:\Xash3D\src_main\engine\common\world.c"
+]
+Creating command line "cl.exe @"C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSP2A8.tmp"" 
+Creating temporary file "C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSP2A9.tmp" with contents
+[
+user32.lib msvcrtd.lib vfw32.lib msacm32.lib gdi32.lib winmm.lib ../utils/vgui/lib/win32_vc6/vgui.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"..\temp\engine\!debug/engine.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\temp\engine\!debug/engine.dll" /implib:"..\temp\engine\!debug/engine.lib" /pdbtype:sept 
+"\Xash3D\src_main\temp\engine\!debug\avikit.obj"
+"\Xash3D\src_main\temp\engine\!debug\build.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_beam.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_cmds.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_demo.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_frame.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_game.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_main.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_menu.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_parse.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_part.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_pmove.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_pred.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_scrn.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_studio.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_tent.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_video.obj"
+"\Xash3D\src_main\temp\engine\!debug\cl_view.obj"
+"\Xash3D\src_main\temp\engine\!debug\con_utils.obj"
+"\Xash3D\src_main\temp\engine\!debug\console.obj"
+"\Xash3D\src_main\temp\engine\!debug\engfuncs.obj"
+"\Xash3D\src_main\temp\engine\!debug\gl_rsurf.obj"
+"\Xash3D\src_main\temp\engine\!debug\host.obj"
+"\Xash3D\src_main\temp\engine\!debug\infostring.obj"
+"\Xash3D\src_main\temp\engine\!debug\input.obj"
+"\Xash3D\src_main\temp\engine\!debug\keys.obj"
+"\Xash3D\src_main\temp\engine\!debug\mathlib.obj"
+"\Xash3D\src_main\temp\engine\!debug\model.obj"
+"\Xash3D\src_main\temp\engine\!debug\net_buffer.obj"
+"\Xash3D\src_main\temp\engine\!debug\net_chan.obj"
+"\Xash3D\src_main\temp\engine\!debug\net_encode.obj"
+"\Xash3D\src_main\temp\engine\!debug\net_huff.obj"
+"\Xash3D\src_main\temp\engine\!debug\pm_studio.obj"
+"\Xash3D\src_main\temp\engine\!debug\pm_surface.obj"
+"\Xash3D\src_main\temp\engine\!debug\pm_trace.obj"
+"\Xash3D\src_main\temp\engine\!debug\portals.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_backend.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_dsp.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_load.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_main.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_mix.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_mouth.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_stream.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_utils.obj"
+"\Xash3D\src_main\temp\engine\!debug\s_vox.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_client.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_cmds.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_custom.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_frame.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_game.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_init.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_main.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_move.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_phys.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_pmove.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_save.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_studio.obj"
+"\Xash3D\src_main\temp\engine\!debug\sv_world.obj"
+"\Xash3D\src_main\temp\engine\!debug\titles.obj"
+"\Xash3D\src_main\temp\engine\!debug\vgui_int.obj"
+"\Xash3D\src_main\temp\engine\!debug\world.obj"
+]
+Creating command line "link.exe @"C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSP2A9.tmp""
+Creating temporary file "C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSP2AA.bat" with contents
+[
+@echo off
+copy \Xash3D\src_main\temp\engine\!debug\engine.dll "D:\Xash3D\engine.dll"
+]
+Creating command line ""C:\DOCUME~1\ÌÈØÀ\LOCALS~1\Temp\RSP2AA.bat""
+Compiling...
+avikit.c
+build.c
+cl.exe terminated at user request.
+
+
+ + diff --git a/launch/launch.h b/launch/launch.h index 3b56474a..db9b6745 100644 --- a/launch/launch.h +++ b/launch/launch.h @@ -249,13 +249,7 @@ qboolean lzss_decompress( const byte *in, const byte *inend, byte *out, byte *ou // float sse_sqrt( float x ); -_inline float sqrtf( float x ) { return ((float)sqrt((double)x)); } -_inline float sinf( float x ) { return ((float)sin((double)x)); } -_inline float asinf( float x ) { return ((float)asin((double)x)); } -_inline float cosf( float x ) { return ((float)cos((double)x)); } -_inline float acosf( float x ) { return ((float)acos((double)x)); } -_inline float tanf( float x ) { return ((float)tan((double)x)); } -_inline float atan2f( float x, float y ) { return ((float)atan2((double)x,(double)y)); } +_inline float sqrtf( float x ) { return sqrt( x ); } void SinCos( float radians, float *sine, float *cosine ); // diff --git a/launch/system.c b/launch/system.c index 8f047d73..8ddb206b 100644 --- a/launch/system.c +++ b/launch/system.c @@ -237,13 +237,13 @@ void Sys_GetStdAPI( void ) // changed after called Sys_InitCPU com.sincos = SinCos; // fast sincos - com.atan2 = atan2f; // fast arctan - com.acos = acosf; // fast arccos - com.asin = asinf; // fast arcsin + com.atan2 = atan2; // fast arctan + com.acos = acos; // fast arccos + com.asin = asin; // fast arcsin com.sqrt = sqrtf; // fast sqrt - com.sin = sinf; // fast sine - com.cos = cosf; // fast cosine - com.tan = tanf; // fast tan + com.sin = sin; // fast sine + com.cos = cos; // fast cosine + com.tan = tan; // fast tan // stdlib.c funcs com.strnupr = com_strnupr; diff --git a/mainui/mainui.plg b/mainui/mainui.plg new file mode 100644 index 00000000..34c6d59f --- /dev/null +++ b/mainui/mainui.plg @@ -0,0 +1,16 @@ + + +
+
Build Log

+

+--------------------Configuration: mainui - Win32 Debug--------------------
+

+
Command Lines

+
+
+
+
Results

+mainui.dll - 0 error(s), 0 warning(s)
+
+ + diff --git a/public/launch_api.h b/public/launch_api.h index 0d6e75d9..a6cc1058 100644 --- a/public/launch_api.h +++ b/public/launch_api.h @@ -679,13 +679,13 @@ typedef struct stdilib_api_s // mathlib.c funcs void (*sincos)( float x, float *sin, float *cos ); // fast sincos - float (*atan2)( float x, float y ); // fast arctan - float (*acos)( float x ); // fast arccos - float (*asin)( float x ); // fast arcsin + double (*atan2)( double x, double y ); // fast arctan + double (*acos)( double x ); // fast arccos + double (*asin)( double x ); // fast arcsin + double (*sin)( double x ); // fast sine + double (*cos)( double x ); // fast cosine + double (*tan)( double x ); // fast tan float (*sqrt)( float x ); // fast sqrt - float (*sin)( float x ); // fast sine - float (*cos)( float x ); // fast cosine - float (*tan)( float x ); // fast tan // stdlib.c funcs void (*strnupr)(const char *in, char *out, size_t size_out); // convert string to upper case