Reduce to required changes.

jakurzak · May 27, 2020 · 49ece6f · 49ece6f
1 parent e595ff5
commit 49ece6f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 69 deletions.
diff --git a/apps/BUILD b/apps/BUILD
@@ -1,40 +1,8 @@
-windows_copts = [
-    "/D__CLANG_SUPPORT_DYN_ANNOTATION__",
-    "/D_USE_MATH_DEFINES",
-    "/DEIGEN_MAX_ALIGN_BYTES=64",
-    "/DEIGEN_HAS_TYPE_TRAITS=0",
-    "/DTF_USE_SNAPPY",
-    "/showIncludes",
-    "/MD",
-    "/O2",
-    "/DNDEBUG",
-    "/w",
-    "-DWIN32_LEAN_AND_MEAN",
-    "-DNOGDI",
-    "/arch:AVX",
-    "/std:c++14",
-    "/DPLATFORM_WINDOWS",
-    "/DEIGEN_HAS_C99_MATH",
-    "/DEIGEN_AVOID_STL_ARRAY",
-    "/Iexternal/gemmlowp",
-    "/wd4018",
-    "/wd4577",
-    "/DNOGDI",
-    "/UTF_COMPILE_LIBRARY",
-]
-
-config_setting(
-    name = "windows",
-    constraint_values = ["@bazel_tools//platforms:windows"],
-)
+# TODO: remove reliance on getopt (unistd.h) to allow apps to run on Windows.
 
 cc_binary(
     name = "qsim_base",
     srcs = ["qsim_base.cc"],
-    copts = select({
-        ":windows": windows_copts,
-        "//conditions:default": [],
-    }),
     deps = [
         "//lib:run_qsim_lib",
     ],
@@ -44,10 +12,6 @@ cc_binary(
 cc_binary(
     name = "qsim_von_neumann",
     srcs = ["qsim_von_neumann.cc"],
-    copts = select({
-        ":windows": windows_copts,
-        "//conditions:default": [],
-    }),
     deps = [
         "//lib:run_qsim_lib",
     ],
@@ -56,10 +20,6 @@ cc_binary(
 cc_binary(
     name = "qsim_amplitudes",
     srcs = ["qsim_amplitudes.cc"],
-    copts = select({
-        ":windows": windows_copts,
-        "//conditions:default": [],
-    }),
     deps = [
         "//lib:bitstring",
         "//lib:run_qsim_lib",
@@ -69,10 +29,6 @@ cc_binary(
 cc_binary(
     name = "qsimh_base",
     srcs = ["qsimh_base.cc"],
-    copts = select({
-        ":windows": windows_copts,
-        "//conditions:default": [],
-    }),
     deps = [
         "//lib:bitstring",
         "//lib:run_qsimh_lib",
@@ -82,10 +38,6 @@ cc_binary(
 cc_binary(
     name = "qsimh_amplitudes",
     srcs = ["qsimh_amplitudes.cc"],
-    copts = select({
-        ":windows": windows_copts,
-        "//conditions:default": [],
-    }),
     deps = [
         "//lib:bitstring",
         "//lib:run_qsimh_lib",

diff --git a/tests/BUILD b/tests/BUILD
@@ -5,28 +5,8 @@ omp_copts = ['-fopenmp']
 omp_linkopts = ['-lgomp']
 
 windows_copts = [
-    "/D__CLANG_SUPPORT_DYN_ANNOTATION__",
-    "/D_USE_MATH_DEFINES",
-    "/DEIGEN_MAX_ALIGN_BYTES=64",
-    "/DEIGEN_HAS_TYPE_TRAITS=0",
-    "/DTF_USE_SNAPPY",
-    "/showIncludes",
-    "/MD",
-    "/O2",
-    "/DNDEBUG",
-    "/w",
-    "-DWIN32_LEAN_AND_MEAN",
-    "-DNOGDI",
     "/arch:AVX",
     "/std:c++14",
-    "/DPLATFORM_WINDOWS",
-    "/DEIGEN_HAS_C99_MATH",
-    "/DEIGEN_AVOID_STL_ARRAY",
-    "/Iexternal/gemmlowp",
-    "/wd4018",
-    "/wd4577",
-    "/DNOGDI",
-    "/UTF_COMPILE_LIBRARY",
 ]
 
 config_setting(