Fossil SCM

resource generate running on XP/dmc&pellesc5

wolfgang 2010-09-30 15:12 wolfgangFormat2CSS_2
Commit 9d896dcadb7e6adcd8de16193a600e5f98511372
Parent 12eb50d1346ab76…
3 files changed +7 -7 +1 -1 +1 -1
~ src/config.h ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc
M src/config.h
+7 -7
--- src/config.h
+++ src/config.h
@@ -16,21 +16,20 @@
1616
 *******************************************************************************
1717
 **
1818
 ** A common header file used by all modules.
1919
 */
2020
21
-#ifndef _RC_COMPILE_
22
-
2321
 /* The following macros are necessary for large-file support under
2422
 ** some linux distributions, and possibly other unixes as well.
2523
 */
2624
 #define _LARGE_FILE 1
2725
 #ifndef _FILE_OFFSET_BITS
2826
 # define _FILE_OFFSET_BITS 64
2927
 #endif
3028
 #define _LARGEFILE_SOURCE 1
3129
30
+#ifndef _RC_COMPILE_
3231
3332
 /*
3433
 ** System header files used by all modules
3534
 */
3635
 #include <unistd.h>
@@ -38,10 +37,13 @@
3837
 #include <stdlib.h>
3938
 #include <ctype.h>
4039
 #include <string.h>
4140
 #include <stdarg.h>
4241
 #include <assert.h>
42
+
43
+#endif
44
+
4345
 #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
4446
 # if defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
4547
 typedef int socklen_t;
4648
 # endif
4749
 # ifndef _WIN32
@@ -51,28 +53,26 @@
5153
 # include <sys/types.h>
5254
 # include <signal.h>
5355
 # include <pwd.h>
5456
 #endif
5557
56
-#endif
57
-
5858
 /*
5959
 ** Define the compiler variant, used to compile the project
6060
 */
6161
 #if !defined(COMPILE_VARIANT)
62
-# if defined(__MINGW32__)
63
-# define COMPILE_VARIANT "mingw32"
64
-# elif defined(__DMC__)
62
+# if defined(__DMC__)
6563
 # define COMPILE_VARIANT "dmc"
6664
 # elif defined(__POCC__)
6765
 # if defined(_M_X64)
6866
 # define COMPILE_VARIANT "pellesc64"
6967
 # else
7068
 # define COMPILE_VARIANT "pellesc32"
7169
 # endif
7270
 # elif defined(_MSC_VER)
7371
 # define COMPILE_VARIANT "msc"
72
+# elif defined(__MINGW32__)
73
+# define COMPILE_VARIANT "mingw32"
7474
 # elif defined(_WIN32)
7575
 # define COMPILE_VARIANT "win32"
7676
 # else
7777
 # define COMPILE_VARIANT "unx-std"
7878
 # endif
7979
--- src/config.h
+++ src/config.h
@@ -16,21 +16,20 @@
16 *******************************************************************************
17 **
18 ** A common header file used by all modules.
19 */
20
21 #ifndef _RC_COMPILE_
22
23 /* The following macros are necessary for large-file support under
24 ** some linux distributions, and possibly other unixes as well.
25 */
26 #define _LARGE_FILE 1
27 #ifndef _FILE_OFFSET_BITS
28 # define _FILE_OFFSET_BITS 64
29 #endif
30 #define _LARGEFILE_SOURCE 1
31
 
32
33 /*
34 ** System header files used by all modules
35 */
36 #include <unistd.h>
@@ -38,10 +37,13 @@
38 #include <stdlib.h>
39 #include <ctype.h>
40 #include <string.h>
41 #include <stdarg.h>
42 #include <assert.h>
 
 
 
43 #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
44 # if defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
45 typedef int socklen_t;
46 # endif
47 # ifndef _WIN32
@@ -51,28 +53,26 @@
51 # include <sys/types.h>
52 # include <signal.h>
53 # include <pwd.h>
54 #endif
55
56 #endif
57
58 /*
59 ** Define the compiler variant, used to compile the project
60 */
61 #if !defined(COMPILE_VARIANT)
62 # if defined(__MINGW32__)
63 # define COMPILE_VARIANT "mingw32"
64 # elif defined(__DMC__)
65 # define COMPILE_VARIANT "dmc"
66 # elif defined(__POCC__)
67 # if defined(_M_X64)
68 # define COMPILE_VARIANT "pellesc64"
69 # else
70 # define COMPILE_VARIANT "pellesc32"
71 # endif
72 # elif defined(_MSC_VER)
73 # define COMPILE_VARIANT "msc"
 
 
74 # elif defined(_WIN32)
75 # define COMPILE_VARIANT "win32"
76 # else
77 # define COMPILE_VARIANT "unx-std"
78 # endif
79
--- src/config.h
+++ src/config.h
@@ -16,21 +16,20 @@
16 *******************************************************************************
17 **
18 ** A common header file used by all modules.
19 */
20
 
 
21 /* The following macros are necessary for large-file support under
22 ** some linux distributions, and possibly other unixes as well.
23 */
24 #define _LARGE_FILE 1
25 #ifndef _FILE_OFFSET_BITS
26 # define _FILE_OFFSET_BITS 64
27 #endif
28 #define _LARGEFILE_SOURCE 1
29
30 #ifndef _RC_COMPILE_
31
32 /*
33 ** System header files used by all modules
34 */
35 #include <unistd.h>
@@ -38,10 +37,13 @@
37 #include <stdlib.h>
38 #include <ctype.h>
39 #include <string.h>
40 #include <stdarg.h>
41 #include <assert.h>
42
43 #endif
44
45 #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
46 # if defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
47 typedef int socklen_t;
48 # endif
49 # ifndef _WIN32
@@ -51,28 +53,26 @@
53 # include <sys/types.h>
54 # include <signal.h>
55 # include <pwd.h>
56 #endif
57
 
 
58 /*
59 ** Define the compiler variant, used to compile the project
60 */
61 #if !defined(COMPILE_VARIANT)
62 # if defined(__DMC__)
 
 
63 # define COMPILE_VARIANT "dmc"
64 # elif defined(__POCC__)
65 # if defined(_M_X64)
66 # define COMPILE_VARIANT "pellesc64"
67 # else
68 # define COMPILE_VARIANT "pellesc32"
69 # endif
70 # elif defined(_MSC_VER)
71 # define COMPILE_VARIANT "msc"
72 # elif defined(__MINGW32__)
73 # define COMPILE_VARIANT "mingw32"
74 # elif defined(_WIN32)
75 # define COMPILE_VARIANT "win32"
76 # else
77 # define COMPILE_VARIANT "unx-std"
78 # endif
79
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -59,11 +59,11 @@
5959
 CCFLAGS=-T$(TARGETMACHINE_CC)-coff -Ot -W2 -Gd -Go -Ze -MT $(DEFINES)
6060
 INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR)
6161
6262
 RESOURCE=fossil.res
6363
 RC=$(PellesCDir)\bin\porc.exe
64
-RCFLAGS=$(INCLUDE)
64
+RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
6565
6666
 UTILS=translate.exe mkindex.exe makeheaders.exe
6767
 UTILS_OBJ=$(UTILS:.exe=.obj)
6868
6969
 SRC=add.c allrepo.c attach.c bag.c blob.c branch.c browse.c captcha.c cgi.c checkin.c checkout.c clearsign.c clone.c comformat.c configure.c content.c db.c delta.c deltacmd.c descendants.c diff.c diffcmd.c doc.c encode.c file.c finfo.c graph.c http.c http_socket.c http_ssl.c http_transport.c info.c login.c main.c manifest.c md5.c merge.c merge3.c name.c pivot.c popen.c pqueue.c printf.c rebuild.c report.c rss.c schema.c search.c setup.c sha1.c shun.c skins.c stat.c style.c sync.c tag.c th_main.c timeline.c tkt.c tktsetup.c undo.c update.c url.c user.c verify.c vfile.c wiki.c wikiformat.c winhttp.c xfer.c zip.c
7070
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -59,11 +59,11 @@
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 RESOURCE=fossil.res
63 RC=$(PellesCDir)\bin\porc.exe
64 RCFLAGS=$(INCLUDE)
65
66 UTILS=translate.exe mkindex.exe makeheaders.exe
67 UTILS_OBJ=$(UTILS:.exe=.obj)
68
69 SRC=add.c allrepo.c attach.c bag.c blob.c branch.c browse.c captcha.c cgi.c checkin.c checkout.c clearsign.c clone.c comformat.c configure.c content.c db.c delta.c deltacmd.c descendants.c diff.c diffcmd.c doc.c encode.c file.c finfo.c graph.c http.c http_socket.c http_ssl.c http_transport.c info.c login.c main.c manifest.c md5.c merge.c merge3.c name.c pivot.c popen.c pqueue.c printf.c rebuild.c report.c rss.c schema.c search.c setup.c sha1.c shun.c skins.c stat.c style.c sync.c tag.c th_main.c timeline.c tkt.c tktsetup.c undo.c update.c url.c user.c verify.c vfile.c wiki.c wikiformat.c winhttp.c xfer.c zip.c
70
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -59,11 +59,11 @@
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 RESOURCE=fossil.res
63 RC=$(PellesCDir)\bin\porc.exe
64 RCFLAGS=$(INCLUDE) -D__POCC__=1 -D_M_X$(TARGETVERSION)
65
66 UTILS=translate.exe mkindex.exe makeheaders.exe
67 UTILS_OBJ=$(UTILS:.exe=.obj)
68
69 SRC=add.c allrepo.c attach.c bag.c blob.c branch.c browse.c captcha.c cgi.c checkin.c checkout.c clearsign.c clone.c comformat.c configure.c content.c db.c delta.c deltacmd.c descendants.c diff.c diffcmd.c doc.c encode.c file.c finfo.c graph.c http.c http_socket.c http_ssl.c http_transport.c info.c login.c main.c manifest.c md5.c merge.c merge3.c name.c pivot.c popen.c pqueue.c printf.c rebuild.c report.c rss.c schema.c search.c setup.c sha1.c shun.c skins.c stat.c style.c sync.c tag.c th_main.c timeline.c tkt.c tktsetup.c undo.c update.c url.c user.c verify.c vfile.c wiki.c wikiformat.c winhttp.c xfer.c zip.c
70
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -29,11 +29,11 @@
2929
 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
3030
3131
 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3232
3333
 RC=$(DMDIR)\bin\rcc
34
-RCFLAGS=-32 -w1 -I$(SRCDIR)
34
+RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
3535
3636
 APPNAME = $(OBJDIR)\fossil$(E)
3737
3838
 all: $(APPNAME)
3939
4040
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -29,11 +29,11 @@
29 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33 RC=$(DMDIR)\bin\rcc
34 RCFLAGS=-32 -w1 -I$(SRCDIR)
35
36 APPNAME = $(OBJDIR)\fossil$(E)
37
38 all: $(APPNAME)
39
40
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -29,11 +29,11 @@
29 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33 RC=$(DMDIR)\bin\rcc
34 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36 APPNAME = $(OBJDIR)\fossil$(E)
37
38 all: $(APPNAME)
39
40

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button