teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split r3159..r3161, part 1: Makefile and MSVC project file changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3166 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-15 14:27:49 +00:00
parent 1cd11d06ef
commit f20a001618
5 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/Makefile.common
View file

@ -208,7 +208,7 @@ endif
# compiler flags etc.
BASECFLAGS= -Wno-attributes
BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement
BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive
BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing
BASEASFLAGS=-s #-g
BASELDFLAGS=

17
polymer/eduke32/Makefile.msvc
View file

@ -1,5 +1,5 @@
# EDuke32 Makefile for Microsoft NMake
CPLUSPLUS=1
SRC=source
OBJ=obj_win
EROOT=build
@ -25,16 +25,20 @@ DXROOT="H:\Microsoft DirectX SDK (February 2010)"
!ifdef DEBUG
# debugging options
flags_cl= /Od /Zi
flags_cl=/Od /Zi
flags_link=/DEBUG
!else
# release options
flags_cl=/O2 /GL /arch:SSE /MP /I$(WDKROOT)\inc\crt
flags_link=/RELEASE /LTCG /LIBPATH:$(WDKROOT)\lib\wxp\i386 /LIBPATH:$(WDKROOT)\lib\Crt\i386
flags_cl=/O2 /GL /arch:SSE /MP # /I$(WDKROOT)\inc\crt /I$(WDKROOT)\inc\api
flags_link=/RELEASE /LTCG # /LIBPATH:$(WDKROOT)\lib\wxp\i386 /LIBPATH:$(WDKROOT)\lib\Crt\i386
!endif
ENGINEOPTS=/DUSE_OPENGL /DPOLYMER
!ifdef CPLUSPLUS
ENGINEOPTS=$(ENGINEOPTS) /TP
!endif
CC=cl
AS=ml
LINK=link /nologo /opt:ref
@ -57,7 +61,7 @@ CFLAGS=$(CFLAGS) /DDEBUGGINGAIDS /D "_CRT_SECURE_NO_DEPRECATE"
LIBS=$(LIBS) msvcrtd.lib
!else
# comment msvcrt_winxp.obj if not using the WDK
LIBS=$(LIBS) msvcrt.lib msvcrt_winxp.obj
LIBS=$(LIBS) msvcrt.lib # msvcrt_winxp.obj
!endif
JMACTOBJ=$(OBJ)\file_lib.$o \
@ -71,7 +75,9 @@ JMACTOBJ=$(OBJ)\file_lib.$o \
AUDIOLIBOBJ=$(OBJ)\midi.$o $(OBJ)\music.$o $(OBJ)\mpu401.$o
GAMEOBJS=$(OBJ)\game.$o \
$(OBJ)\game_inline.$o \
$(OBJ)\actors.$o \
$(OBJ)\actors_inline.$o \
$(OBJ)\anim.$o \
$(OBJ)\common.$o \
$(OBJ)\demo.$o \
@ -87,6 +93,7 @@ GAMEOBJS=$(OBJ)\game.$o \
$(OBJ)\premap.$o \
$(OBJ)\savegame.$o \
$(OBJ)\sector.$o \
$(OBJ)\sector_inline.$o \
$(OBJ)\rts.$o \
$(OBJ)\config.$o \
$(OBJ)\animlib.$o\

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

@ -35,8 +35,8 @@ flags_link=/DEBUG
flags_lib=
!else
# release options
flags_cl=/O2 /GL /arch:SSE /MP /I$(WDKROOT)\inc\crt
flags_link=/RELEASE /LTCG /LIBPATH:$(WDKROOT)\lib\Crt\i386 /LIBPATH:$(WDKROOT)\lib\wxp\i386
flags_cl=/O2 /GL /arch:SSE /MP # /I$(WDKROOT)\inc\crt
flags_link=/RELEASE /LTCG # /LIBPATH:$(WDKROOT)\lib\Crt\i386 /LIBPATH:$(WDKROOT)\lib\wxp\i386
flags_lib=/LTCG
!endif
@ -45,7 +45,7 @@ AS=ml
RC=rc
LINK=link /opt:ref /nologo
CFLAGS=$(CFLAGS) /nologo /MT /J $(flags_cl) $(TARGETOPTS) /I$(INC)
ASFLAGS=/nologo /coff /c
ASFLAGS=/nologo /coff /c
EXESUFFIX=.exe
!ifdef DEBUG
CFLAGS=$(CFLAGS) /DDEBUGGINGAIDS /D "_CRT_SECURE_NO_DEPRECATE"

8
polymer/eduke32/eduke32.vcxproj
View file

@ -104,12 +104,16 @@
<ClInclude Include="build\include\scriptfile.h" />
<ClInclude Include="build\include\sdlayer.h" />
<ClInclude Include="build\include\startwin.editor.h" />
<ClInclude Include="build\include\tracker.hpp" />
<ClInclude Include="build\include\tracker_operator.hpp" />
<ClInclude Include="build\include\tracker_operators.hpp" />
<ClInclude Include="build\include\winlayer.h" />
<ClInclude Include="build\include\msvc\inttypes.h" />
<ClInclude Include="build\include\msvc\stdint.h" />
<ClInclude Include="build\src\engine_priv.h" />
<ClInclude Include="source\actors.h" />
<ClInclude Include="source\anim.h" />
<ClInclude Include="source\animvpx.h" />
<ClInclude Include="source\demo.h" />
<ClInclude Include="source\game.h" />
<ClInclude Include="source\gameexec.h" />
@ -215,9 +219,11 @@
<ClCompile Include="build\src\winlayer.c" />
<ClCompile Include="source\actors.c" />
<ClCompile Include="source\anim.c" />
<ClCompile Include="source\animvpx.c" />
<ClCompile Include="source\astub.c" />
<ClCompile Include="source\config.c" />
<ClCompile Include="source\demo.c" />
<ClCompile Include="source\enet\src\compress.c" />
<ClCompile Include="source\game.c" />
<ClCompile Include="source\gamedef.c" />
<ClCompile Include="source\gameexec.c" />
@ -285,4 +291,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

20
polymer/eduke32/eduke32.vcxproj.filters
View file

@ -390,6 +390,18 @@
<ClInclude Include="source\input.h">
<Filter>eduke32\headers</Filter>
</ClInclude>
<ClInclude Include="build\include\tracker_operator.hpp">
<Filter>build\headers</Filter>
</ClInclude>
<ClInclude Include="build\include\tracker_operators.hpp">
<Filter>build\headers</Filter>
</ClInclude>
<ClInclude Include="build\include\tracker.hpp">
<Filter>build\headers</Filter>
</ClInclude>
<ClInclude Include="source\animvpx.h">
<Filter>eduke32\headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="build\src\a-c.c">
@ -677,6 +689,12 @@
<ClCompile Include="source\input.c">
<Filter>eduke32\source</Filter>
</ClCompile>
<ClCompile Include="source\animvpx.c">
<Filter>eduke32\source</Filter>
</ClCompile>
<ClCompile Include="source\enet\src\compress.c">
<Filter>enet\source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="Makefile.msvc">
@ -686,4 +704,4 @@
<Filter>build</Filter>
</None>
</ItemGroup>
</Project>
</Project>