zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 00:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-12-28 21:24:41 +01:00
commit 9d48c84ee3
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -187,6 +187,7 @@ else( WIN32 )
if( GTK2_FOUND ) if( GTK2_FOUND )
set( ZDOOM_LIBS ${ZDOOM_LIBS} ${GTK2_LIBRARIES} ) set( ZDOOM_LIBS ${ZDOOM_LIBS} ${GTK2_LIBRARIES} )
include_directories( ${GTK2_INCLUDE_DIRS} ) include_directories( ${GTK2_INCLUDE_DIRS} )
link_directories( ${GTK2_LIBRARY_DIRS} )
else( GTK2_FOUND ) else( GTK2_FOUND )
set( NO_GTK ON ) set( NO_GTK ON )
endif( GTK2_FOUND ) endif( GTK2_FOUND )

4
zdoom.vcproj
View file

@ -106,6 +106,7 @@
MapExports="true" MapExports="true"
SubSystem="2" SubSystem="2"
StackReserveSize="0" StackReserveSize="0"
LargeAddressAware="2"
TerminalServerAware="2" TerminalServerAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
@ -223,6 +224,7 @@
MapExports="true" MapExports="true"
SubSystem="2" SubSystem="2"
StackReserveSize="0" StackReserveSize="0"
LargeAddressAware="2"
TerminalServerAware="2" TerminalServerAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
@ -332,6 +334,7 @@
ProgramDatabaseFile=".\Debug/zdoomd.pdb" ProgramDatabaseFile=".\Debug/zdoomd.pdb"
SubSystem="2" SubSystem="2"
StackReserveSize="0" StackReserveSize="0"
LargeAddressAware="2"
TerminalServerAware="2" TerminalServerAware="2"
SetChecksum="false" SetChecksum="false"
TargetMachine="0" TargetMachine="0"
@ -440,6 +443,7 @@
ProgramDatabaseFile=".\Debug/zdoomd.pdb" ProgramDatabaseFile=".\Debug/zdoomd.pdb"
SubSystem="2" SubSystem="2"
StackReserveSize="0" StackReserveSize="0"
LargeAddressAware="2"
TerminalServerAware="2" TerminalServerAware="2"
SetChecksum="false" SetChecksum="false"
TargetMachine="17" TargetMachine="17"