Skip to content

Commit b292efc

Browse files
committed
Fix broken wexsandbox and DView debug version build on Windows
1 parent 7b87338 commit b292efc

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ if (UNIX)
7474
set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config)
7575
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
7676
endif ()
77-
else ()
78-
set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
77+
#else ()
78+
# set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
7979
# set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG Release)
80-
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
80+
# find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
8181
endif ()
8282

8383
include(${wxWidgets_USE_FILE})

tools/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ else ()
9090
target_link_libraries(wexsandbox optimized ${LK_LIB})
9191
endif()
9292
endif ()
93+
94+
include(${wxWidgets_USE_FILE})
95+
add_compile_options(${wxWidgets_CXX_FLAGS})
96+
add_definitions(-DLK_USE_WXWIDGETS )
97+
9398
if (UNIX AND NOT APPLE)
9499
target_link_libraries(wexsandbox wex ${wxWidgets_LIBRARIES} ${FONTCONFIG_LIBRARY})
95100
else ()

0 commit comments

Comments
 (0)