diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-18 14:54:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-18 14:54:14 +0000 |
| commit | 4d5664922a121914cddc705cfb8b0ba2daeb3b1c (patch) | |
| tree | 4de6b10b4ef819954a15dd0cb4e68b5930f3902e | |
| parent | 58b69e7eb9be29c60e45d46a880b391e3809e76f (diff) | |
| download | vcxsrv-4d5664922a121914cddc705cfb8b0ba2daeb3b1c.tar.gz vcxsrv-4d5664922a121914cddc705cfb8b0ba2daeb3b1c.tar.bz2 vcxsrv-4d5664922a121914cddc705cfb8b0ba2daeb3b1c.zip | |
Now it is possible to have spaces in the root directory name of the source tree
(when using mhmake version 1.4.0)
| -rw-r--r-- | makefile.after | 6 | ||||
| -rw-r--r-- | makefile.before | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/makefile | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/makefile.after b/makefile.after index 5324decca..600343e3e 100644 --- a/makefile.after +++ b/makefile.after @@ -48,9 +48,9 @@ $(EXE) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE) endif # End WINAPP or TTYAPP stuff
ifeq ($(DEBUG),1)
-COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I"%") -Fo"$(relpath $@)" -Fd"$(PDB)" "$<"
+COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" $<
else
-COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I"%") -Fo"$(relpath $@)" "$<"
+COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) $<
PDB= # There is no PDB file generated in a release build
endif
@@ -76,7 +76,7 @@ $(OBJDIR)\%$(OBJEXT) : %.cc $(CC) $(CCFLAGS) /EHsc $(COMMONCFLAGS)
$(OBJDIR)\%.res : %.rc
- $(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i "%") -Fo"$(relpath $@)" "$<"
+ $(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
ifdef INC_BDF_RULES
load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
diff --git a/makefile.before b/makefile.before index df6d084e2..851625e7e 100644 --- a/makefile.before +++ b/makefile.before @@ -1,3 +1,7 @@ +ifndef DEBUG
+DEBUG=0
+endif
+
default: all
.PHONY : default
diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile index 345357d92..63b37dd1b 100644 --- a/xorg-server/hw/xwin/xlaunch/makefile +++ b/xorg-server/hw/xwin/xlaunch/makefile @@ -18,7 +18,7 @@ WINAPP = xlaunch RESOURCES = resources.rc
$(OBJDIR)\%.res : resources\%.rc
- $(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i "%") -Fo"$(relpath $@)" "$<"
+ $(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
LIBDIRS=$(dir $(INCLUDELIBFILES))
|