Skip to content

OR Tools #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjanzou wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

OR Tools #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b6687f5
updates to c++20 for or-tools compatibility on Windows
sjanzou Apr 25, 2025
c7a2433
Merge branch 'patch' into ortool__full_release
sjanzou Sep 1, 2025
c905c01
testing using release versions of wxWidgets
sjanzou Sep 4, 2025
89cec77
Working on release versions for wxWidgets libraries
sjanzou Sep 10, 2025
717ca60
wxWidgets in top level - all but export_config building on Windows
sjanzou Sep 11, 2025
248192d
Merge remote-tracking branch 'origin/develop' into ortools_build
sjanzou Oct 9, 2025
90d44bd
Merge branch 'develop' into ortools_build
sjanzou Jan 4, 2026
7b87338
fix issue with wex runner for Windows CMakeLists.txt
sjanzou Jan 4, 2026
b292efc
Fix broken wexsandbox and DView debug version build on Windows
sjanzou Feb 4, 2026
65ea9fb
Fix issue with wex GA Windows runner
sjanzou Feb 4, 2026
3ea9d07
Updates for Windows debug build for GA runners
sjanzou Feb 5, 2026
b853d5f
Update all c++ cmake commands to be consistent with ortools v9.14
sjanzou Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ Project(wex C CXX)
# Compile Options per Platform
#
#####################################################################################################################
if(MSVC)
set(CMAKE_CXX_STANDARD 20)
else()
set(CMAKE_CXX_STANDARD 17)
endif()

if (MSVC)
add_compile_options(/W3 /MP)
Expand All @@ -44,10 +49,6 @@ if (MSVC)
set(${flag_var} "${${flag_var}} /D_DEBUG" CACHE STRING "compile flags" FORCE)
endforeach ()
else ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# if (APPLE)
# add_compile_options( -arch x86_64 -arch arm64 )
# endif ()
add_compile_options(-Wall -Wno-unknown-pragmas -Wno-strict-aliasing)
add_compile_options(-fno-common ${wxWidgets_CXX_FLAGS})
add_definitions(-DLK_USE_WXWIDGETS -D_CRT_SECURE_NO_WARNINGS -D_MBCS -DFT2_BUILD_LIBRARY -DOPJ_STATIC -DFT_CONFIG_MODULES_H=\"slimftmodules.h\" -DFT_CONFIG_OPTIONS_H=\"slimftoptions.h\")
Expand All @@ -69,17 +70,20 @@ endif ()
if (UNIX)
if (EXISTS /usr/local/bin/wx-config-3)
set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
else ()
set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config)
find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
endif ()
else ()
set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
# set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG Release)
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
endif ()

include(${wxWidgets_USE_FILE})
if (wxWidgets_FOUND)
include(${wxWidgets_USE_FILE})
endif ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")

if (UNIX AND NOT APPLE)
Expand Down
2 changes: 1 addition & 1 deletion src/dview/dvfilereader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ bool wxDVFileReader::ReadSQLFile(wxDVPlotCtrl *plotWin, const wxString &filename
dictionaryIndex = sqlite3_column_int(sqlStmtPtr, 0);
name = ColumnText(sqlite3_column_text(sqlStmtPtr, 1));
keyValue = ColumnText(sqlite3_column_text(sqlStmtPtr, 2)).length() ? ColumnText(
sqlite3_column_text(sqlStmtPtr, 2)) : "Site";
sqlite3_column_text(sqlStmtPtr, 2)) : wxString("Site");
rf = ColumnText(sqlite3_column_text(sqlStmtPtr, 3));
units = ColumnText(sqlite3_column_text(sqlStmtPtr, 4));

Expand Down
2 changes: 1 addition & 1 deletion src/ole/iehtmlwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void wxIEHtmlWin::SetupBrowser() {
m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);

m_webBrowser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);
m_webBrowser->Navigate((BSTR)"about:blank", NULL, NULL, NULL, NULL);
}


Expand Down
2 changes: 1 addition & 1 deletion src/registration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ END_EVENT_TABLE()

wxOnlineRegistration::wxOnlineRegistration(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
gs_regData ? gs_regData->GetAppName() + " Registration" : "Software Registration",
gs_regData ? gs_regData->GetAppName() + wxString(" Registration") : wxString("Software Registration"),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) {
wxFont font(wxMetroTheme::Font(wxMT_LIGHT, 12));
SetBackgroundColour(wxMetroTheme::Colour(wxMT_FOREGROUND));
Expand Down
12 changes: 12 additions & 0 deletions tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ set(DVIEW_SRC
# CMake Targets
#
#####################################################################################################################
if(MSVC)
set(CMAKE_CXX_STANDARD 20)
else()
set(CMAKE_CXX_STANDARD 17)
endif()

# wexsandbox
add_executable(wexsandbox ${WEX_SRC} ${wexsandbox_SRC})
Expand Down Expand Up @@ -90,6 +95,13 @@ else ()
target_link_libraries(wexsandbox optimized ${LK_LIB})
endif()
endif ()

if (wxWidgets_FOUND)
include(${wxWidgets_USE_FILE})
endif ()
add_compile_options(${wxWidgets_CXX_FLAGS})
add_definitions(-DLK_USE_WXWIDGETS )

if (UNIX AND NOT APPLE)
target_link_libraries(wexsandbox wex ${wxWidgets_LIBRARIES} ${FONTCONFIG_LIBRARY})
else ()
Expand Down