You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jf...@apache.org on 2003/08/08 15:09:34 UTC

cvs commit: jakarta-commons-sandbox/daemon/src/native/nt/procrun Makefile procgui.c

jfclere     2003/08/08 06:09:34

  Modified:    daemon/src/native/nt/procrun Makefile procgui.c
  Log:
  get procrunw.exe compiled on cygwin.
  
  Revision  Changes    Path
  1.4       +9 -1      jakarta-commons-sandbox/daemon/src/native/nt/procrun/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/nt/procrun/Makefile,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile	8 Aug 2003 10:57:13 -0000	1.3
  +++ Makefile	8 Aug 2003 13:09:34 -0000	1.4
  @@ -4,9 +4,17 @@
   # CFLAGS for debugging
   #CFLAGS=-D_DEBUG
   
  -all: $(BIN)/procrun
  +all: $(BIN)/procrun $(BIN)/procrunw
   
   $(BIN)/procrun: procrun.c
   	gcc -mno-cygwin $(INCLUDE) $(CFLAGS) -DPROCRUN_CONSOLE procrun.c \
   	-lshlwapi \
   	-o $(BIN)/procrun
  +
  +$(BIN)/procrunw: procrun.c
  +	gcc -mno-cygwin $(INCLUDE) $(CFLAGS) -DPROCRUN_WINAPP -c procgui.c
  +	gcc -mno-cygwin $(INCLUDE) $(CFLAGS) -DPROCRUN_WINAPP procrun.c \
  +	procgui.o \
  +	-lshlwapi \
  +	-lcomctl32 \
  +	-o $(BIN)/procrunw
  
  
  
  1.24      +8 -0      jakarta-commons-sandbox/daemon/src/native/nt/procrun/procgui.c
  
  Index: procgui.c
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/nt/procrun/procgui.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- procgui.c	13 May 2003 06:33:07 -0000	1.23
  +++ procgui.c	8 Aug 2003 13:09:34 -0000	1.24
  @@ -102,6 +102,10 @@
   #define CONWRAP_EFATAL         3
   #define TIMEOUT_TIME           20000    /* startup timeout (ms) */
   
  +#ifndef PSH_NOCONTEXTHELP
  +#define PSH_NOCONTEXTHELP       0x02000000
  +#endif
  +
   extern int g_proc_mode;
   /* The main envronment for services */
   extern procrun_t *g_env;
  @@ -506,9 +510,11 @@
                       lvc.pszText     = ac_columns[i].label;
                       ListView_InsertColumn(ac_list_hwnd, i, &lvc );
                  }
  +#ifdef LVS_EX_FULLROWSELECT
                  ListView_SetExtendedListViewStyleEx(ac_list_hwnd, 0,
                                                      LVS_EX_FULLROWSELECT |
                                                      LVS_EX_INFOTIP);
  +#endif
              }
              ac_add_list_string(NULL, 0);
              break;
  @@ -995,7 +1001,9 @@
       psh.hwndParent       = owner;
       psh.hInstance        = ac_instance;
       psh.pszIcon          = MAKEINTRESOURCE(IDI_ICOCONWRAP);
  +#if (_WIN32_IE >= 0x0500)
       psh.pszbmHeader      = MAKEINTRESOURCE(IDB_BMPJAKARTA);
  +#endif
       psh.pszCaption       = title;
       psh.nPages           = sizeof(psp) / sizeof(PROPSHEETPAGE);
       psh.ppsp             = (LPCPROPSHEETPAGE) &psp;