ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-14 08:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix Linux compile from mhash stuff

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@339 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
TTimo 2010-11-26 06:46:05 +00:00
parent e393e112f4
commit 0152053e52
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConscript.q3map2
View file

@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment() env = Environment()
settings.SetupEnvironment( env, config['name'] ) settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common' ] ) env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
env.Append( LIBS = [ 'pthread', 'png', 'jpeg', 'mhash' ] ) env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) ) proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) )
objects = lib_objects objects = lib_objects
objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ] objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ]

2
config.py
View file

@ -158,7 +158,7 @@ class Config:
build_dir = os.path.join( 'build', config_name, 'q3map2' ) build_dir = os.path.join( 'build', config_name, 'q3map2' )
BuildDir( build_dir, '.', duplicate = 0 ) BuildDir( build_dir, '.', duplicate = 0 )
lib_objects = [] lib_objects = []
for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]: for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib_VC9.vcproj' ]:
Export( 'project' ) Export( 'project' )
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' ) Export( 'lib_objects' )

8
libs/md4lib.h
View file

@ -9,6 +9,12 @@
#ifndef MD4_H #ifndef MD4_H
#define MD4_H #define MD4_H
#ifdef _WIN32
#include "stdint.msvc.h"
#else
#include <stdint.h>
#endif
struct hash_method { struct hash_method {
const char *name; const char *name;
/* Number of bytes that must be allocated for context */ /* Number of bytes that must be allocated for context */
@ -26,8 +32,6 @@ const struct hash_method *hash_method_lookup(const char *name);
/* NULL-terminated list of all hash methods */ /* NULL-terminated list of all hash methods */
extern const struct hash_method *hash_methods[]; extern const struct hash_method *hash_methods[];
typedef unsigned int uint_fast32_t;
#define MD4_RESULTLEN (128/8) #define MD4_RESULTLEN (128/8)
struct md4_context { struct md4_context {

4
libs/md5lib/md4.c
View file

@ -18,10 +18,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
#include "../stdint.msvc.h"
#endif
#include "md4lib.h" #include "md4lib.h"
/* /*