zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 02:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change a few paths in various MSVC Makefiles to better suit my current dev environment. This doesn't really affect anyone else since these paths need to be customized to fit whatever machine by anyone building with MSVC anyway.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3282 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-12-14 17:13:17 +00:00
parent 049e63d7f3
commit ba8d1a5c1e
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/eduke32/Makefile.msvc
View file

@ -30,8 +30,9 @@ EDITORLIB=build.lib
# the WDK allows us to link against msvcrt.dll instead of msvcrxxx.dll
# this path should match build\Makefile.msvc
WDKROOT="H:\WinDDK\7600.16385.1"
DXROOT="H:\Microsoft DirectX SDK (February 2010)"
# WDKROOT="H:\WinDDK\7600.16385.1"
DXROOT="C:\SDKs\Microsoft DirectX SDK (February 2010)"
VORBISSDK="C:\SDKs\oggvorbis-win32sdk-1.0.1"
!ifdef DEBUG
# debugging options
@ -56,7 +57,7 @@ MT=mt
CFLAGS= /MT /J /nologo $(flags_cl) \
/I$(INC) /I$(EINC)\msvc /I$(EINC)\ /I$(SRC)\jmact /I$(JAUDIOLIBDIR)\include /I$(ENETDIR)\include \
/W2 $(ENGINEOPTS) \
/I$(DXROOT)\include /DRENDERTYPEWIN=1
/I$(DXROOT)\include /I$(VORBISSDK)\include /DRENDERTYPEWIN=1
LIBS=user32.lib gdi32.lib shell32.lib winmm.lib ws2_32.lib dxguid.lib comctl32.lib \
vorbisfile_static.lib vorbis_static.lib ogg_static.lib dsound.lib advapi32.lib
@ -160,11 +161,11 @@ EDITOROBJS=$(OBJ)\astub.$o \
all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) # duke3d_w32$(EXESUFFIX);
eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)\$(ENGINELIB) $(JAUDIOLIBDIR)\$(JAUDIOLIB) $(ENETDIR)\$(ENETLIB)
$(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib$(DXLIB) $(flags_link) /MAP $** $(LIBS)
$(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib$(DXLIB) /LIBPATH:$(VORBISSDK)\lib $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $(RSRC)$(WINLIB)\manifest.game.xml -hashupdate -outputresource:$@ -out:$@.manifest
mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)\$(ENGINELIB) $(EOBJ)\$(EDITORLIB) $(JAUDIOLIBDIR)\$(JAUDIOLIB)
$(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib$(DXLIB) $(flags_link) /MAP $** $(LIBS)
$(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS /LIBPATH:$(DXROOT)\lib$(DXLIB) /LIBPATH:$(VORBISSDK)\lib $(flags_link) /MAP $** $(LIBS)
$(MT) -manifest $(RSRC)$(WINLIB)\manifest.build.xml -hashupdate -outputresource:$@ -out:$@.manifest
!include Makefile.deps

2
polymer/eduke32/build/Makefile.msvc
View file

@ -23,7 +23,7 @@ ENGINELIB=engine.lib
EDITORLIB=build.lib
# this path should match eduke32\Makefile.msvc
WDKROOT="H:\WinDDK\7600.16385.1"
# WDKROOT="H:\WinDDK\7600.16385.1"
# /D these to enable certain features of the port's compile process
# NOASM When defined, uses C instead of assembly code

4
polymer/eduke32/source/jaudiolib/Makefile.msvc
View file

@ -18,8 +18,8 @@ flags_lib=/LTCG
CC=cl
LINK=link /opt:ref /nologo
DXROOT=U:\SDKs\Microsoft DirectX SDK (April 2007)
VORBISSDK=U:\SDKs\oggvorbis-win32sdk-1.0.1
DXROOT=C:\SDKs\Microsoft DirectX SDK (April 2010)
VORBISSDK=C:\SDKs\oggvorbis-win32sdk-1.0.1
CFLAGS=$(CFLAGS) /nologo /MT /J $(flags_cl) $(TARGETOPTS) /I$(INC) /I$(SRC) /I"$(VORBISSDK)\include" /I"$(DXROOT)\include"
!ifdef DEBUG