[Cgui-develop] cgui/misc makefile.mgw,1.1.1.1.2.2,1.1.1.1.2.3 makefile.vc,1.3.2.3,1.3.2.4

[Rasmus M. <ras...@us...>]

Update of /cvsroot/cgui/cgui/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15081

Modified Files:
      Tag: Branch_CGUI_1-6-4
	makefile.mgw makefile.vc 
Log Message:
Fixed reading of $(SystemRoot) and $(SYSTEMROOT)

Index: makefile.vc
===================================================================
RCS file: /cvsroot/cgui/cgui/misc/makefile.vc,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** makefile.vc	15 Mar 2004 17:12:32 -0000	1.3.2.3
--- makefile.vc	23 May 2004 15:59:17 -0000	1.3.2.4
***************
*** 78,86 ****
  
  ifeq ($(OS),Windows_NT)
! WINSYSDIR = $(SYSTEMROOT)
! WINSUBDIR = system32
  else
! WINSYSDIR = $(windir)
! WINSUBDIR = system
  endif
  
--- 78,92 ----
  
  ifeq ($(OS),Windows_NT)
!    WINSYSDIR = $(SYSTEMROOT)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(SystemRoot)
!    endif
!    WINSUBDIR = system32
  else
!    WINSYSDIR = $(WINDIR)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(windir)
!    endif
!    WINSUBDIR = system
  endif
  

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cgui/cgui/misc/makefile.mgw,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** makefile.mgw	27 Feb 2004 23:08:11 -0000	1.1.1.1.2.2
--- makefile.mgw	23 May 2004 15:59:16 -0000	1.1.1.1.2.3
***************
*** 69,87 ****
  
  ifeq ($(OS),Windows_NT)
! # true 32 bit OS:
! ifeq ($(TERM),msys)
! WINSYSDIR = $(SYSTEMROOT)
! else
! WINSYSDIR = $(SystemRoot)
! endif
! WINSUBDIR = system32
! else
! # DOS based windows:
! ifeq ($(TERM),msys)
! WINSYSDIR = $(WINDIR)
  else
! WINSYSDIR = $(windir)
! endif
! WINSUBDIR = system
  endif
  
--- 69,83 ----
  
  ifeq ($(OS),Windows_NT)
!    WINSYSDIR = $(SYSTEMROOT)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(SystemRoot)
!    endif
!    WINSUBDIR = system32
  else
!    WINSYSDIR = $(WINDIR)
!    ifeq ($(WINSYSDIR),)
!       WINSYSDIR = $(windir)
!    endif
!    WINSUBDIR = system
  endif