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:
David Anderson 2013-12-30 17:51:00 -05:00
parent ae21f29ad9
commit 6d320163a1
4 changed files with 15 additions and 3 deletions
AMBuildScript
extensions/curl/curl-src/lib
public
sourcepawn/compiler

View File

@ -252,7 +252,8 @@ class SMConfig(object):
binary.sources += ['version.rc'] binary.sources += ['version.rc']
binary.compiler.rcdefines += [ binary.compiler.rcdefines += [
'BINARY_NAME="{0}"'.format(binary.outputFile), 'BINARY_NAME="{0}"'.format(binary.outputFile),
'SM_GENERATED_BUILD' 'SM_GENERATED_BUILD',
'RC_COMPILE',
] ]
elif builder.target_platform == 'mac': elif builder.target_platform == 'mac':
binary.compiler.postlink += [ binary.compiler.postlink += [
@ -269,7 +270,8 @@ class SMConfig(object):
binary.sources += ['version.rc'] binary.sources += ['version.rc']
binary.compiler.rcdefines += [ binary.compiler.rcdefines += [
'BINARY_NAME="{0}"'.format(binary.outputFile), 'BINARY_NAME="{0}"'.format(binary.outputFile),
'SM_GENERATED_BUILD' 'SM_GENERATED_BUILD',
'RC_COMPILE',
] ]
binary.compiler.linkflags += [self.versionlib] binary.compiler.linkflags += [self.versionlib]
binary.compiler.sourcedeps += SM.generated_headers binary.compiler.sourcedeps += SM.generated_headers

View File

@ -14,6 +14,12 @@ if builder.target_platform is 'mac':
mac_tuple = mac_version.split('.') mac_tuple = mac_version.split('.')
if int(mac_tuple[0]) >= 10 and int(mac_tuple[1]) >= 9: if int(mac_tuple[0]) >= 10 and int(mac_tuple[1]) >= 9:
binary.compiler.defines += ['BUILTIN_STRLCAT'] binary.compiler.defines += ['BUILTIN_STRLCAT']
elif builder.target_platform is 'windows':
binary.compiler.defines += [
'BUILDING_LIBCURL',
'CURL_STATICLIB',
'CURL_DISABLE_LDAP',
]
binary.sources += [ binary.sources += [
'base64.c', 'base64.c',
@ -52,7 +58,6 @@ binary.sources += [
'llist.c', 'llist.c',
'md5.c', 'md5.c',
'memdebug.c', 'memdebug.c',
'mprintf.c',
'multi.c', 'multi.c',
'netrc.c', 'netrc.c',
'nss.c', 'nss.c',
@ -82,5 +87,7 @@ binary.sources += [
'url.c', 'url.c',
'version.c' 'version.c'
] ]
if builder.target_platform != 'windows':
builder.sources += ['mprintf.c']
rvalue = builder.Add(binary) rvalue = builder.Add(binary)

View File

@ -39,6 +39,9 @@
*/ */
#if defined SM_GENERATED_BUILD #if defined SM_GENERATED_BUILD
# if defined RC_COMPILE
# undef SM_USE_VERSIONLIB
# endif
# if defined SM_USE_VERSIONLIB # if defined SM_USE_VERSIONLIB
# include <versionlib.h> # include <versionlib.h>
# else # else