misc nix

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/ZeroRadiant@199 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/SConscript.q3map2 b/SConscript.q3map2
index e141c723396c4bfea225b25a5737d375a5e21385..24e0523dd450c6c6ac01f3e9b3005a0328666f5f 100644 (file)
--- 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 195e3d851e8667c99a4d5639eaf4f27b5852d42e..92ffa5952483db3244e71c9c0280772a9c092797 100644 (file)
--- 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 c6ab2ebbbc47dfcef0b2ea5668d7b35e68353c2a..526dd6c96c88527d27cb64785079f2d2fe6f516a 100644 (file)
--- 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;