diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 21:57:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 21:57:00 +0200 |
| commit | 60f523c253e988d310ca2e14aff817e916ad2e7e (patch) | |
| tree | 1036e789b072da2901ef1f7f24157f43cb722c3d /sal/systools | |
| parent | d6392679b897f6b76cbeef7eac1aa88b78f0523d (diff) | |
Initial hacks for 64-bit Windows build
Diffstat (limited to 'sal/systools')
| -rw-r--r--[-rwxr-xr-x] | sal/systools/win32/uwinapi/makefile.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk index 57faa5cf7..b086228b6 100755..100644 --- a/sal/systools/win32/uwinapi/makefile.mk +++ b/sal/systools/win32/uwinapi/makefile.mk @@ -47,14 +47,11 @@ CXXFLAGS+= $(LFS_CFLAGS) CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type .ENDIF -.IF "$(COMEX)"=="9" -.IF "$(PSDK_HOME)"!="" -# Since the 02/2003 PSDK the "new" linker is needed here. -LINK=$(WRAPCMD) "$(PSDK_HOME)$/Bin$/Win64$/LINK.EXE" -.ENDIF -.ENDIF +SLOFILES= + +.IF "$(CPU)"=="I" -SLOFILES=\ +SLOFILES+=\ $(SLO)$/CheckTokenMembership.obj\ $(SLO)$/CommandLineToArgvW.obj\ $(SLO)$/CopyFileExA.obj\ @@ -79,8 +76,6 @@ SLOFILES=\ $(SLO)$/DllMain.obj\ $(SLO)$/ResolveThunk.obj\ $(SLO)$/ResolveUnicows.obj\ - $(SLO)$/snprintf.obj\ - $(SLO)$/snwprintf.obj\ $(SLO)$/FindFirstVolumeA.obj\ $(SLO)$/FindFirstVolumeW.obj\ $(SLO)$/FindNextVolumeA.obj\ @@ -111,7 +106,13 @@ SLOFILES=\ $(SLO)$/PathSetDlgItemPathW.obj\ $(SLO)$/PathStripToRootW.obj\ $(SLO)$/SHCreateItemFromParsingName.obj - + +.ENDIF + +SLOFILES+=\ + $(SLO)$/snprintf.obj\ + $(SLO)$/snwprintf.obj + SHL1TARGET=$(TARGET) SHL1IMPLIB=$(SHL1TARGET) SHL1DEF=$(MISC)/$(SHL1TARGET).def |