Jelajahi Sumber

CMake: Update dcparse(r) as latter now has EXPCL

Sam Edwards 7 tahun lalu
induk
melakukan
d94f27bedd
2 mengubah file dengan 6 tambahan dan 12 penghapusan
  1. 4 10
      direct/src/dcparse/CMakeLists.txt
  2. 2 2
      direct/src/dcparser/CMakeLists.txt

+ 4 - 10
direct/src/dcparse/CMakeLists.txt

@@ -1,10 +1,4 @@
-if(WIN32)
-  # We can't build dcparse on Windows, because the dcparser symbols aren't
-  # properly exported from p3direct.dll.
-  return()
-endif()
-
-add_executable(dcparse dcparse.cxx)
-target_compile_definitions(dcparse PUBLIC WITHIN_PANDA)
-target_link_libraries(dcparse p3direct)
-install(TARGETS dcparse DESTINATION bin)
+add_executable(p3dcparse dcparse.cxx)
+target_compile_definitions(p3dcparse PUBLIC WITHIN_PANDA)
+target_link_libraries(p3dcparse p3direct)
+install(TARGETS p3dcparse DESTINATION bin)

+ 2 - 2
direct/src/dcparser/CMakeLists.txt

@@ -46,8 +46,8 @@ set(P3DCPARSER_PARSER_SOURCES
     dcLexer.cxx)
 
 composite_sources(p3dcparser P3DCPARSER_SOURCES)
-add_component_library(p3dcparser NOINIT ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES}
-  ${P3DCPARSER_PARSER_SOURCES})
+add_component_library(p3dcparser NOINIT SYMBOL BUILDING_DIRECT_DCPARSER
+  ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES} ${P3DCPARSER_PARSER_SOURCES})
 target_compile_definitions(p3dcparser PUBLIC WITHIN_PANDA)
 target_link_libraries(p3dcparser p3directbase panda)
 target_use_packages(p3dcparser PYTHON)