Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last correction for makefile.g95: win32 mkdir does not like forward slashes as directory

Browse Source 
separators.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-11-08 21:06:19 +00:00
parent ea6601756a
commit 6433f6d316
2 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
distrib/msw/tmake/g95.t
View File

@@ -280,9 +280,27 @@ else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif endif
ARCHINCDIR=$(subst /,\,$(WXDIR))\lib\msw$(INCEXT) # MBN: if anyone has a better solution for this kludge, step
# forward, *please*
# this tests is we are on cygwin or not ( will _not_ work if you are using
# ZSH on plain Win32, tought ); it uses the presence of "/"
# in the PATH variable
SETUP_H=$(ARCHINCDIR)\wx\setup.h # how do you do "VAR=\" ? BLEAGH!
BACKSLASH=$(subst a,\,a)
ifeq (,$(findstring /,$(PATH)))
IS_CYGWIN=0
PATH_SEPARATOR:=$(BACKSLASH)
PATH_SUBST=/
else
IS_CYGWIN=1
PATH_SEPARATOR=/
PATH_SUBST:=$(BACKSLASH)
endif
ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
SETUP_H=$(ARCHINCDIR)/wx/setup.h
ifndef WXMAKINGDLL ifndef WXMAKINGDLL
all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)
@@ -290,12 +308,12 @@ else
all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL) all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
endif endif
$(ARCHINCDIR)\wx: $(ARCHINCDIR)/wx:
mkdir $(ARCHINCDIR) mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
mkdir $(ARCHINCDIR)\wx mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
$(SETUP_H): $(ARCHINCDIR)\wx $(SETUP_H): $(ARCHINCDIR)/wx
$(COPY) $(WXDIR)\include\wx\msw\setup.h $@ $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
ifndef WXMAKINGDLL ifndef WXMAKINGDLL

28
src/msw/makefile.g95
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 10:56, 2001/11/03 # This file was automatically generated by tmake at 22:05, 2001/11/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
# #
@@ -482,7 +482,25 @@ else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif endif
ARCHINCDIR=$(subst /,\,$(WXDIR))/lib/msw$(INCEXT) # MBN: if anyone has a better solution for this kludge, step
# forward, *please*
# this tests is we are on cygwin or not ( will _not_ work if you are using
# ZSH on plain Win32, tought ); it uses the presence of "/"
# in the PATH variable
# how do you do "VAR=\" ? BLEAGH!
BACKSLASH=$(subst a,\,a)
ifeq (,$(findstring /,$(PATH)))
IS_CYGWIN=0
PATH_SEPARATOR:=$(BACKSLASH)
PATH_SUBST=/
else
IS_CYGWIN=1
PATH_SEPARATOR=/
PATH_SUBST:=$(BACKSLASH)
endif
ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
SETUP_H=$(ARCHINCDIR)/wx/setup.h SETUP_H=$(ARCHINCDIR)/wx/setup.h
@@ -493,11 +511,11 @@ all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEX
endif endif
$(ARCHINCDIR)/wx: $(ARCHINCDIR)/wx:
mkdir $(ARCHINCDIR) mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
mkdir $(ARCHINCDIR)/wx mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
$(SETUP_H): $(ARCHINCDIR)/wx $(SETUP_H): $(ARCHINCDIR)/wx
$(COPY) $(WXDIR)/include/wx/msw/setup.h $@ $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
ifndef WXMAKINGDLL ifndef WXMAKINGDLL