Skip to content
Permalink
Browse files

openjk: update to 20180401

  • Loading branch information
kencu committed Apr 9, 2018
1 parent 034de66 commit b59a4ccdb05864219674b99dea39606323f0fada
Showing with 5 additions and 31 deletions.
  1. +5 −4 games/openjk/Portfile
  2. +0 −27 games/openjk/files/patch-CMakeLists-Clang-ID.diff
@@ -5,9 +5,9 @@ PortGroup cmake 1.1
PortGroup github 1.0
PortGroup cxx11 1.1

github.setup JACoders OpenJK eba428e64e314ddb822d52f3bf10c12c8f631cfe
github.setup JACoders OpenJK c62c0f2d4905af9a98b7cfece4ef9591185253d1
name openjk
version 20171215
version 20180401
categories games
platforms darwin
maintainers {kencu @kencu} openmaintainer
@@ -17,8 +17,9 @@ description Community effort to maintain and improve Jedi Academy + Jedi
Outcast released by Raven Software.
long_description ${description}

checksums rmd160 f452c78d544f29496c6f7edfd0192ae4f977e4da \
sha256 9bd54dc145b61b5bbfae72f74d3e5504d38db7ce97aa90d2648bd73bfb9c4775
checksums rmd160 9d6d08f43670b1b5e1ddb0b83e25b4aa20066cae \
sha256 4065aaee45fcbe7c0b85a69a3e38f40d55873424b01f1bb9dfdd7841efc26760 \
size 12514663

depends_lib port:libsdl2 \
port:libpng \
@@ -9,30 +9,3 @@

# For checks in subdirectories
set(InOpenJK TRUE)
@@ -211,7 +211,7 @@
# We don't try to control symbol visibility under MSVC.
set(OPENJK_VISIBILITY_FLAGS "")

-elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
+elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang"))
# I hope this doesn't come back to bite me in the butt later on.
# Realistically though, can the C and CXX compilers be different?

@@ -260,7 +260,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")
endif()
- elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+ elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-comment")
endif()
@@ -275,7 +275,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
endif()
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-writable-strings")

0 comments on commit b59a4cc

Please sign in to comment.
You can’t perform that action at this time.