Various Windows build fixes (bug 5997 part 13, r=ds).
--HG-- rename : sourcepawn/compiler/libpawnc.rc => sourcepawn/compiler/version.rc
This commit is contained in:
parent
ae21f29ad9
commit
6d320163a1
@ -252,7 +252,8 @@ class SMConfig(object):
|
||||
binary.sources += ['version.rc']
|
||||
binary.compiler.rcdefines += [
|
||||
'BINARY_NAME="{0}"'.format(binary.outputFile),
|
||||
'SM_GENERATED_BUILD'
|
||||
'SM_GENERATED_BUILD',
|
||||
'RC_COMPILE',
|
||||
]
|
||||
elif builder.target_platform == 'mac':
|
||||
binary.compiler.postlink += [
|
||||
@ -269,7 +270,8 @@ class SMConfig(object):
|
||||
binary.sources += ['version.rc']
|
||||
binary.compiler.rcdefines += [
|
||||
'BINARY_NAME="{0}"'.format(binary.outputFile),
|
||||
'SM_GENERATED_BUILD'
|
||||
'SM_GENERATED_BUILD',
|
||||
'RC_COMPILE',
|
||||
]
|
||||
binary.compiler.linkflags += [self.versionlib]
|
||||
binary.compiler.sourcedeps += SM.generated_headers
|
||||
|
@ -14,6 +14,12 @@ if builder.target_platform is 'mac':
|
||||
mac_tuple = mac_version.split('.')
|
||||
if int(mac_tuple[0]) >= 10 and int(mac_tuple[1]) >= 9:
|
||||
binary.compiler.defines += ['BUILTIN_STRLCAT']
|
||||
elif builder.target_platform is 'windows':
|
||||
binary.compiler.defines += [
|
||||
'BUILDING_LIBCURL',
|
||||
'CURL_STATICLIB',
|
||||
'CURL_DISABLE_LDAP',
|
||||
]
|
||||
|
||||
binary.sources += [
|
||||
'base64.c',
|
||||
@ -52,7 +58,6 @@ binary.sources += [
|
||||
'llist.c',
|
||||
'md5.c',
|
||||
'memdebug.c',
|
||||
'mprintf.c',
|
||||
'multi.c',
|
||||
'netrc.c',
|
||||
'nss.c',
|
||||
@ -82,5 +87,7 @@ binary.sources += [
|
||||
'url.c',
|
||||
'version.c'
|
||||
]
|
||||
if builder.target_platform != 'windows':
|
||||
builder.sources += ['mprintf.c']
|
||||
rvalue = builder.Add(binary)
|
||||
|
||||
|
@ -39,6 +39,9 @@
|
||||
*/
|
||||
|
||||
#if defined SM_GENERATED_BUILD
|
||||
# if defined RC_COMPILE
|
||||
# undef SM_USE_VERSIONLIB
|
||||
# endif
|
||||
# if defined SM_USE_VERSIONLIB
|
||||
# include <versionlib.h>
|
||||
# else
|
||||
|
Loading…
Reference in New Issue
Block a user