Fossil SCM
added 64 bit windows compile for PellesC/6.00.4
Commit
528c58115437f39f07bd6a1f5b4fea32a44aba06
Parent
94abf61c52b014a…
1 file changed
+23
-4
+23
-4
| --- win/Makefile.PellesCGMake | ||
| +++ win/Makefile.PellesCGMake | ||
| @@ -18,28 +18,47 @@ | ||
| 18 | 18 | # this file is tested with |
| 19 | 19 | # PellesC 5.00.13 |
| 20 | 20 | # gmake 3.80 |
| 21 | 21 | # zlib sources 1.2.5 |
| 22 | 22 | # Windows XP SP 2 |
| 23 | +# and | |
| 24 | +# PellesC 6.00.4 | |
| 25 | +# gmake 3.80 | |
| 26 | +# zlib sources 1.2.5 | |
| 27 | +# Windows 7 Home Premium | |
| 23 | 28 | # |
| 24 | 29 | # ########################################################################### |
| 25 | 30 | |
| 26 | 31 | # |
| 27 | 32 | PellesCDir=c:\Programme\PellesC |
| 28 | 33 | |
| 34 | +# Select between 32/64 bit code, default is 32 bit | |
| 35 | +#TARGETVERSION=64 | |
| 36 | + | |
| 37 | +ifeq ($(TARGETVERSION),64) | |
| 38 | +# 64 bit version | |
| 39 | +TARGETMACHINE_CC=amd64 | |
| 40 | +TARGETMACHINE_LN=amd64 | |
| 41 | +TARGETEXTEND=64 | |
| 42 | +else | |
| 43 | +# 32 bit version | |
| 44 | +TARGETMACHINE_CC=x86 | |
| 45 | +TARGETMACHINE_LN=ix86 | |
| 46 | +TARGETEXTEND= | |
| 47 | +endif | |
| 48 | + | |
| 29 | 49 | B=.. |
| 30 | 50 | SRCDIR=$(B)/src/ |
| 31 | 51 | WINDIR=$(B)/win/ |
| 32 | -ZLIBSRCDIR=E:/Profile/Ratte/data/organize/fossil-w32/zlib/ | |
| 52 | +ZLIBSRCDIR=E:/fossil-w32/zlib/ | |
| 33 | 53 | |
| 34 | 54 | LINK=$(PellesCDir)/bin/polink.exe |
| 35 | -LIB=$(PellesCDir)\Lib\Win;$(PellesCDir)\Lib | |
| 36 | -LINKFLAGS=-machine:ix86 -subsystem:console /LIBPATH:$(PellesCDir)\lib /LIBPATH:$(PellesCDir)\lib\win kernel32.lib advapi32.lib delayimp.lib Wsock32.lib Crtmt.lib | |
| 55 | +LINKFLAGS=-subsystem:console -machine:$(TARGETMACHINE_LN) /LIBPATH:$(PellesCDir)\lib\win$(TARGETEXTEND) /LIBPATH:$(PellesCDir)\lib kernel32.lib advapi32.lib delayimp$(TARGETEXTEND).lib Wsock32.lib Crtmt$(TARGETEXTEND).lib | |
| 37 | 56 | |
| 38 | 57 | CC=$(PellesCDir)\bin\pocc.exe |
| 39 | 58 | DEFINES=-DFOSSIL_I18N=0 -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 40 | -CCFLAGS=-Tx86-coff -Ot -W1 -Gd -Go /Ze $(DEFINES) | |
| 59 | +CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES) | |
| 41 | 60 | INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) |
| 42 | 61 | |
| 43 | 62 | UTILS=translate.exe mkindex.exe makeheaders.exe |
| 44 | 63 | UTILS_OBJ=$(UTILS:.exe=.obj) |
| 45 | 64 | |
| 46 | 65 |
| --- win/Makefile.PellesCGMake | |
| +++ win/Makefile.PellesCGMake | |
| @@ -18,28 +18,47 @@ | |
| 18 | # this file is tested with |
| 19 | # PellesC 5.00.13 |
| 20 | # gmake 3.80 |
| 21 | # zlib sources 1.2.5 |
| 22 | # Windows XP SP 2 |
| 23 | # |
| 24 | # ########################################################################### |
| 25 | |
| 26 | # |
| 27 | PellesCDir=c:\Programme\PellesC |
| 28 | |
| 29 | B=.. |
| 30 | SRCDIR=$(B)/src/ |
| 31 | WINDIR=$(B)/win/ |
| 32 | ZLIBSRCDIR=E:/Profile/Ratte/data/organize/fossil-w32/zlib/ |
| 33 | |
| 34 | LINK=$(PellesCDir)/bin/polink.exe |
| 35 | LIB=$(PellesCDir)\Lib\Win;$(PellesCDir)\Lib |
| 36 | LINKFLAGS=-machine:ix86 -subsystem:console /LIBPATH:$(PellesCDir)\lib /LIBPATH:$(PellesCDir)\lib\win kernel32.lib advapi32.lib delayimp.lib Wsock32.lib Crtmt.lib |
| 37 | |
| 38 | CC=$(PellesCDir)\bin\pocc.exe |
| 39 | DEFINES=-DFOSSIL_I18N=0 -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 40 | CCFLAGS=-Tx86-coff -Ot -W1 -Gd -Go /Ze $(DEFINES) |
| 41 | INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) |
| 42 | |
| 43 | UTILS=translate.exe mkindex.exe makeheaders.exe |
| 44 | UTILS_OBJ=$(UTILS:.exe=.obj) |
| 45 | |
| 46 |
| --- win/Makefile.PellesCGMake | |
| +++ win/Makefile.PellesCGMake | |
| @@ -18,28 +18,47 @@ | |
| 18 | # this file is tested with |
| 19 | # PellesC 5.00.13 |
| 20 | # gmake 3.80 |
| 21 | # zlib sources 1.2.5 |
| 22 | # Windows XP SP 2 |
| 23 | # and |
| 24 | # PellesC 6.00.4 |
| 25 | # gmake 3.80 |
| 26 | # zlib sources 1.2.5 |
| 27 | # Windows 7 Home Premium |
| 28 | # |
| 29 | # ########################################################################### |
| 30 | |
| 31 | # |
| 32 | PellesCDir=c:\Programme\PellesC |
| 33 | |
| 34 | # Select between 32/64 bit code, default is 32 bit |
| 35 | #TARGETVERSION=64 |
| 36 | |
| 37 | ifeq ($(TARGETVERSION),64) |
| 38 | # 64 bit version |
| 39 | TARGETMACHINE_CC=amd64 |
| 40 | TARGETMACHINE_LN=amd64 |
| 41 | TARGETEXTEND=64 |
| 42 | else |
| 43 | # 32 bit version |
| 44 | TARGETMACHINE_CC=x86 |
| 45 | TARGETMACHINE_LN=ix86 |
| 46 | TARGETEXTEND= |
| 47 | endif |
| 48 | |
| 49 | B=.. |
| 50 | SRCDIR=$(B)/src/ |
| 51 | WINDIR=$(B)/win/ |
| 52 | ZLIBSRCDIR=E:/fossil-w32/zlib/ |
| 53 | |
| 54 | LINK=$(PellesCDir)/bin/polink.exe |
| 55 | LINKFLAGS=-subsystem:console -machine:$(TARGETMACHINE_LN) /LIBPATH:$(PellesCDir)\lib\win$(TARGETEXTEND) /LIBPATH:$(PellesCDir)\lib kernel32.lib advapi32.lib delayimp$(TARGETEXTEND).lib Wsock32.lib Crtmt$(TARGETEXTEND).lib |
| 56 | |
| 57 | CC=$(PellesCDir)\bin\pocc.exe |
| 58 | DEFINES=-DFOSSIL_I18N=0 -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp |
| 59 | CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES) |
| 60 | INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) |
| 61 | |
| 62 | UTILS=translate.exe mkindex.exe makeheaders.exe |
| 63 | UTILS_OBJ=$(UTILS:.exe=.obj) |
| 64 | |
| 65 |