From c291dc13bac9195d32e072811c1b5b9af088058e Mon Sep 17 00:00:00 2001 From: timo Date: Thu, 28 Feb 2008 16:50:26 +0000 Subject: [PATCH] misc nix git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/ZeroRadiant@199 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- SConscript.q3map2 | 1 - contrib/bobtoolz/StdAfx.h | 4 +++- include/misc_def.h | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SConscript.q3map2 b/SConscript.q3map2 index e141c723..24e0523d 100644 --- a/SConscript.q3map2 +++ b/SConscript.q3map2 @@ -14,7 +14,6 @@ env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] ) proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) ) objects = lib_objects objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ] -objects.append( 'tools/quake3/common/jpeg.c' ) q3map2 = env.Program( 'q3map2.bin', objects ) Return( 'q3map2' ) diff --git a/contrib/bobtoolz/StdAfx.h b/contrib/bobtoolz/StdAfx.h index 195e3d85..92ffa595 100644 --- a/contrib/bobtoolz/StdAfx.h +++ b/contrib/bobtoolz/StdAfx.h @@ -81,7 +81,9 @@ typedef char* LPCSTR; #define IDNO 7 #define WINAPI -#define APIENTRY +#ifndef APIENTRY + #define APIENTRY +#endif #ifndef GUID_DEFINED #define GUID_DEFINED diff --git a/include/misc_def.h b/include/misc_def.h index c6ab2ebb..526dd6c9 100644 --- a/include/misc_def.h +++ b/include/misc_def.h @@ -1,7 +1,9 @@ #ifndef _WIN32 #define WINAPI -#define APIENTRY +#ifndef APIENTRY + #define APIENTRY +#endif typedef void* HMODULE; typedef void* LPVOID; -- 2.39.2