forked from bartvdbraak/blender
code cleanup: avoid confusion with utfconv lib - was configuring this windows only lib on non windows platforms (scons only).
This commit is contained in:
parent
cc1259178b
commit
8fb067af93
@ -3,7 +3,6 @@ Import ('env')
|
||||
|
||||
SConscript(['audaspace/SConscript',
|
||||
'string/SConscript',
|
||||
'utfconv/SConscript', # XXX - why use this on UNIX?
|
||||
'ghost/SConscript',
|
||||
'guardedalloc/SConscript',
|
||||
'moto/SConscript',
|
||||
@ -36,3 +35,6 @@ if NEW_CSG=='false':
|
||||
SConscript(['bsp/SConscript'])
|
||||
else:
|
||||
SConscript(['csg/SConscript'])
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||
SConscript(['utfconv/SConscript'])
|
||||
|
@ -28,10 +28,11 @@ set(SRC
|
||||
utfconv.c
|
||||
|
||||
utfconv.h
|
||||
#utf_func.h
|
||||
)
|
||||
|
||||
|
||||
# This is odd but leave it for now...
|
||||
# Why have win32 check here? - this is only used for windows.
|
||||
# ... because one day we might want to use it on other platforms.
|
||||
if(WIN32)
|
||||
list(APPEND SRC
|
||||
utf_winfunc.c
|
||||
|
@ -1,12 +1,15 @@
|
||||
#!/usr/bin/python
|
||||
Import ('env')
|
||||
|
||||
sources = env.Glob('*.c')
|
||||
sources = ['utfconv.c']
|
||||
|
||||
incs = '.'
|
||||
defs = ''
|
||||
|
||||
|
||||
|
||||
# This is odd but leave it for now...
|
||||
# Why have win32 check here? - this is only used for windows.
|
||||
# ... because one day we might want to use it on other platforms.
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||
sources += ['utf_winfunc.c']
|
||||
|
||||
env.BlenderLib('bf_utfconv', sources, Split(incs), Split(defs), libtype=['intern','player'], priority=[0,0])
|
||||
|
@ -15,7 +15,7 @@
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
||||
* The Original Code is Copyright (C) 2012 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Alexandr Kuznetsov, Andrea Weikert
|
||||
@ -23,8 +23,6 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
#ifndef _WIN32_IE
|
||||
#define _WIN32_IE 0x0501
|
||||
#endif
|
||||
@ -153,5 +151,3 @@ int uputenv(const char *name, const char *value)
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
#endif /* WIN32 */
|
||||
|
@ -15,7 +15,7 @@
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
||||
* The Original Code is Copyright (C) 2012 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Alexandr Kuznetsov, Andrea Weikert
|
||||
@ -23,8 +23,9 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
#ifndef WIN32
|
||||
# error "This file can only compile on windows"
|
||||
#endif
|
||||
|
||||
#include "utfconv.h"
|
||||
#include <stdio.h>
|
||||
@ -40,5 +41,3 @@ int uput_getenv(const char *varname, char * value, size_t buffsize);
|
||||
int uputenv(const char *name, const char *value);
|
||||
|
||||
int umkdir(const char *pathname);
|
||||
|
||||
#endif
|
||||
|
@ -15,7 +15,7 @@
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
||||
* The Original Code is Copyright (C) 2012 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Alexandr Kuznetsov, Andrea Weikert
|
||||
|
@ -15,7 +15,7 @@
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
||||
* The Original Code is Copyright (C) 2012 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Alexandr Kuznetsov, Andrea Weikert
|
||||
|
Loading…
Reference in New Issue
Block a user