@@ -807,6 +807,26 @@ cc_library(
807807 alwayslink = 1 ,
808808)
809809
810+ cc_library (
811+ name = "game_lib_headless_macos" ,
812+ srcs = IOQ3_COMMON_SRCS + [
813+ CODE_DIR + "/deepmind/dmlab_connect.c" ,
814+ CODE_DIR + "/null/null_input.c" ,
815+ CODE_DIR + "/null/null_snddma.c" ,
816+
817+ ## OpenGL rendering
818+ CODE_DIR + "/deepmind/headless_macos_glimp.c" ,
819+ CODE_DIR + "/deepmind/glimp_common.h" ,
820+ CODE_DIR + "/deepmind/glimp_common.c" ,
821+ ],
822+ hdrs = ["public/dmlab.h" ],
823+ copts = IOQ3_COMMON_COPTS ,
824+ defines = IOQ3_COMMON_DEFINES ,
825+ linkopts = ["-framework OpenGL" ],
826+ deps = IOQ3_COMMON_DEPS ,
827+ alwayslink = 1 ,
828+ )
829+
810830cc_library (
811831 name = "game_lib_headless_osmesa" ,
812832 srcs = IOQ3_COMMON_SRCS + [
@@ -842,10 +862,7 @@ cc_library(
842862 hdrs = ["public/dmlab.h" ],
843863 copts = IOQ3_COMMON_COPTS ,
844864 defines = IOQ3_COMMON_DEFINES ,
845- linkopts = [
846- "-lGL" ,
847- "-lX11" ,
848- ],
865+ linkopts = ["-framework OpenGL" ],
849866 deps = IOQ3_COMMON_DEPS ,
850867 alwayslink = 1 ,
851868)
@@ -865,10 +882,7 @@ cc_library(
865882 hdrs = ["public/dmlab.h" ],
866883 copts = IOQ3_COMMON_COPTS ,
867884 defines = IOQ3_COMMON_DEFINES ,
868- linkopts = [
869- "-lEGL" ,
870- "-lGL" ,
871- ],
885+ linkopts = ["-framework OpenGL" ],
872886 deps = IOQ3_COMMON_DEPS + ["//third_party/GL/util:egl_util" ],
873887 alwayslink = 1 ,
874888)
@@ -898,27 +912,18 @@ config_setting(
898912
899913cc_binary (
900914 name = "libdmlab_headless_hw.so" ,
901- linkopts = ["-Wl,--version-script,$(location :dmlab.lds)" ],
902915 linkshared = 1 ,
903916 linkstatic = 1 ,
904917 visibility = ["//testing:__subpackages__" ],
905- deps = [":dmlab.lds" ] + select ({
906- "dmlab_graphics_osmesa_or_egl" : [":game_lib_headless_egl" ],
907- "dmlab_graphics_osmesa_or_glx" : [":game_lib_headless_glx" ],
908- "//conditions:default" : [":game_lib_headless_egl" ],
909- }),
918+ deps = [":game_lib_headless_macos" ],
910919)
911920
912921cc_binary (
913922 name = "libdmlab_headless_sw.so" ,
914- linkopts = ["-Wl,--version-script,$(location :dmlab.lds)" ],
915923 linkshared = 1 ,
916924 linkstatic = 1 ,
917925 visibility = ["//testing:__subpackages__" ],
918- deps = [
919- ":dmlab.lds" ,
920- ":game_lib_headless_osmesa" ,
921- ],
926+ deps = [":game_lib_headless_osmesa" ],
922927)
923928
924929cc_library (
0 commit comments