diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2013-06-21 07:43:15 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2013-06-21 07:43:15 +0100 |
| commit | 8ff1b883db9e7d2cd8c940a5ea7f0e4bad78903d (patch) | |
| tree | 222703e7a6bf7ed2d6976b3eb71318e966761b0a | |
| parent | b405fdcb395f2b48226af7a55a714d4dd3d50a75 (diff) | |
| download | ghostpdl-8ff1b883db9e7d2cd8c940a5ea7f0e4bad78903d.tar.gz | |
Move winrt platform build into "base".
One file required for the winrt platform was being built in psi/msvc.mak, this
moves it to winlib.mak with the rest of the platform.
CLUSTER_UNTESTED
| -rw-r--r-- | gs/base/winlib.mak | 12 | ||||
| -rw-r--r-- | gs/psi/msvc.mak | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/gs/base/winlib.mak b/gs/base/winlib.mak index 95a1aac48..4a77fa117 100644 --- a/gs/base/winlib.mak +++ b/gs/base/winlib.mak @@ -206,9 +206,18 @@ $(GLOBJ)gp_stdia.$(OBJ): $(GLSRC)gp_stdia.c $(AK)\ $(GLCCWIN) $(GLO_)gp_stdia.$(OBJ) $(C_) $(GLSRC)gp_stdia.c # The Metro platform +!ifdef METRO +METRO_OBJS=$(GLOBJ)winrtsup.$(OBJ) $(GLOBJ)gp_wutf8.$(OBJ) + +$(GLOBJ)winrtsup.$(OBJ): $(GLSRCDIR)/winrtsup.cpp + cl /c /EHsc /Fo$(GLOBJ)winrtsup.$(OBJ) $(GLSRCDIR)/winrtsup.cpp +!else +METRO_OBJS= +!endif + metro__=$(GLOBJ)gp_mswin.$(OBJ) $(GLOBJ)gp_wgetv.$(OBJ) $(GLOBJ)gp_wpapr.$(OBJ)\ - $(GLOBJ)gp_stdia.$(OBJ) + $(GLOBJ)gp_stdia.$(OBJ) $(METRO_OBJS) #$(GLOBJ)gp_wutf8.$(OBJ) metro_inc=$(GLD)nosync.dev $(GLD)winplat.dev @@ -216,6 +225,7 @@ $(GLGEN)metro_.dev: $(metro__) $(ECHOGS_XE) $(metro_inc) $(SETMOD) $(GLGEN)metro_ $(metro__) $(ADDMOD) $(GLGEN)metro_ -include $(metro_inc) + # Define MS-Windows handles (file system) as a separable feature. mshandle_=$(GLOBJ)gp_mshdl.$(OBJ) diff --git a/gs/psi/msvc.mak b/gs/psi/msvc.mak index fe7006dcb..af3530bce 100644 --- a/gs/psi/msvc.mak +++ b/gs/psi/msvc.mak @@ -1111,23 +1111,14 @@ $(GSCONSOLE_XE): $(OBJC) $(GS_OBJ).res $(PSSRCDIR)\dw64c.def $(PSSRCDIR)\dw32c.d $(LINK) $(LCT) @$(PSGEN)gswin.rsp $(OBJC) $(LINKLIBPATH) @$(LIBCTR) $(GS_OBJ).res $(GLOBJ)gp_wutf8.$(OBJ) del $(PSGEN)gswin.rsp -!ifdef METRO -METRO_OBJS=$(GLOBJ)winrtsup.$(OBJ) $(GLOBJ)gp_wutf8.$(OBJ) - -$(GLOBJ)winrtsup.$(OBJ): $(GLSRCDIR)/winrtsup.cpp - cl /c /EHsc /Fo$(GLOBJ)winrtsup.$(OBJ) $(GLSRCDIR)/winrtsup.cpp -!else -METRO_OBJS= -!endif - # The big DLL -$(GSDLL_DLL): $(GS_ALL) $(DEVS_ALL) $(GSDLL_OBJS) $(GSDLL_OBJ).res $(PSGEN)lib.rsp $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(METRO_OBJS) +$(GSDLL_DLL): $(GS_ALL) $(DEVS_ALL) $(GSDLL_OBJS) $(GSDLL_OBJ).res $(PSGEN)lib.rsp $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) echo Linking $(GSDLL) $(GSDLL_DLL) $(METRO) echo /DLL /DEF:$(PSSRCDIR)\$(GSDLL).def /OUT:$(GSDLL_DLL) > $(PSGEN)gswin.rsp !if "$(PROFILE)"=="1" echo /PROFILE >> $(PSGEN)gswin.rsp !endif - $(LINK) $(LCT) @$(PSGEN)gswin.rsp $(GSDLL_OBJS) @$(ld_tr) $(METRO_OBJS) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) @$(PSGEN)lib.rsp $(LINKLIBPATH) @$(LIBCTR) $(GSDLL_OBJ).res + $(LINK) $(LCT) @$(PSGEN)gswin.rsp $(GSDLL_OBJS) @$(ld_tr) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) @$(PSGEN)lib.rsp $(LINKLIBPATH) @$(LIBCTR) $(GSDLL_OBJ).res del $(PSGEN)gswin.rsp !else |