Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | unbreak MSVC build.
Always use platform detection in fossil_system: fossil might be linked with unicows, then still quotes should not be used on Win95 Why did I remove the -DUNICODE from Makefile.msc?.... |
|---|---|
| Timelines: | family | ancestors | descendants | both | restore-win95 |
| Files: | files | file ages | folders |
| SHA1: |
ebe241b4df7f606ca103d24267acbdef |
| User & Date: | jan.nijtmans 2012-09-12 20:36:58.502 |
Context
|
2012-09-12
| ||
| 20:55 | allow MSVC build without -DUNICODE as well check-in: eede5db7c3 user: jan.nijtmans tags: restore-win95 | |
| 20:36 |
unbreak MSVC build.
Always use platform detection in fossil_system: fossil might be linked with unicows, then still quotes should not be used on Win95 Why did I remove the -DUNICODE from Makefile.msc?.... check-in: ebe241b4df user: jan.nijtmans tags: restore-win95 | |
| 14:42 | fix [ce73fc2173] as well check-in: ed5695fe7f user: jan.nijtmans tags: restore-win95 | |
Changes
Changes to src/main.c.
| ︙ | ︙ | |||
828 829 830 831 832 833 834 |
*/
int fossil_system(const char *zOrigCmd){
int rc;
#if defined(_WIN32)
/* On windows NT, we have to put double-quotes around the entire command.
** Who knows why - this is just the way windows works.
*/
| < < < > < | | 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 |
*/
int fossil_system(const char *zOrigCmd){
int rc;
#if defined(_WIN32)
/* On windows NT, we have to put double-quotes around the entire command.
** Who knows why - this is just the way windows works.
*/
OSVERSIONINFOA sInfo;
char *zNewCmd;
TCHAR *zMbcs;
sInfo.dwOSVersionInfoSize = sizeof(sInfo);
GetVersionExA(&sInfo);
if (sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT) {
zNewCmd = mprintf("\"%s\"", zOrigCmd);
} else {
zNewCmd = mprintf("%s", zOrigCmd);
}
zMbcs = fossil_utf8_to_mbcs(zNewCmd);
if( g.fSystemTrace ) {
char *zOut = mprintf("SYSTEM: %s\n", zNewCmd);
fossil_puts(zOut, 1);
fossil_free(zOut);
}
rc = _tsystem(zMbcs);
fossil_mbcs_free(zMbcs);
|
| ︙ | ︙ |
Changes to win/Makefile.msc.
| ︙ | ︙ | |||
30 31 32 33 34 35 36 | #ZLIB = zdll.lib ZINCDIR = $(MSCDIR)\extra\include ZLIBDIR = $(MSCDIR)\extra\lib ZLIB = zlib.lib INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR) | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #ZLIB = zdll.lib ZINCDIR = $(MSCDIR)\extra\include ZLIBDIR = $(MSCDIR)\extra\lib ZLIB = zlib.lib INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR) CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE BCC = $(CC) $(CFLAGS) TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 |
| ︙ | ︙ |