mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
- applied more changes to enable the CP932 charset on Windows
- fixed linking with zlib VC++Files/client/mysql.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysql_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqladmin.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqladmin_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlcheck.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlcheck_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlclient.dsp: - added ctype-cp932.c to the file list VC++Files/client/mysqlclient_ia64.dsp: - added ctype-cp932.c to the file list VC++Files/client/mysqldump.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqldump_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlimport.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlimport_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlshow.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqlshow_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqltest.dsp: - added zlib.lib to the LINK32 options VC++Files/client/mysqltest_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/libmysql/libmysql.dsp: - added ctype-cp932.c to the file list VC++Files/libmysql/libmysql_ia64.dsp: - added ctype-cp932.c to the file list VC++Files/mysql-test/mysql_test_run_new.dsp: - added zlib.lib to the LINK32 options VC++Files/mysql-test/mysql_test_run_new_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/mysqlbinlog/mysqlbinlog.dsp: - added zlib.lib to the LINK32 options VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/mysqlcheck/mysqlcheck.dsp: - added zlib.lib to the LINK32 options VC++Files/mysqlcheck/mysqlcheck_ia64.dsp: - added zlib.lib to the LINK32 options VC++Files/mysqlmanager/mysqlmanager.dsp: - added zlib.lib to the LINK32 options VC++Files/strings/strings_ia64.dsp: - added ctype-cp932.c to the file list
This commit is contained in:
@ -54,7 +54,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=xilink6.exe
|
||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /out:"../client_release/MySqlManager.exe"
|
||||
# ADD LINK32 zlib.lib /nologo /subsystem:windows /machine:I386 /out:"../client_release/MySqlManager.exe" /libpath:"..\lib_release\\"
|
||||
# SUBTRACT LINK32 /nodefaultlib
|
||||
|
||||
!ELSEIF "$(CFG)" == "MySqlManager - Win32 Debug"
|
||||
@ -83,7 +83,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=xilink6.exe
|
||||
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /out:"../client_debug/MySqlManager.exe" /pdbtype:sept /libpath:"..\lib_debug\\"
|
||||
# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib zlib.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /out:"../client_debug/MySqlManager.exe" /pdbtype:sept /libpath:"..\lib_debug\\"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ENDIF
|
||||
|
Reference in New Issue
Block a user