Skip to content

Commit

Permalink
impl(core): staging linux
Browse files Browse the repository at this point in the history
  • Loading branch information
shdwmtr committed Jun 14, 2024
1 parent a7fd5f7 commit f67907b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/build
/.vscode
/.vs
/out
/out
/vendor/python/python311.dll
/vendor/python/python311.lib
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "vendor/incbin"]
path = vendor/incbin
url = https://github.com/graphitemaster/incbin.git
[submodule "vendor/vcpkg"]
path = vendor/vcpkg
url = https://github.com/microsoft/vcpkg.git
13 changes: 3 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ add_compile_definitions(
# Compile as release and compile MSVC as MT (static)
set(CMAKE_BUILD_TYPE Release)
if (WIN32)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
elseif(UNIX)
set(CMAKE_CXX_FLAGS "-fpermissive")
endif()
Expand Down Expand Up @@ -87,9 +87,6 @@ if (WIN32)
endif()

include_directories(
# ${Python_INCLUDE_DIRS}
#"C:/Program Files (x86)/Python311-32/include"

${LIBGIT2_INCLUDE_DIRS}
)

Expand Down Expand Up @@ -138,13 +135,11 @@ if (GITHUB_ACTION_BUILD)
endif()

if(WIN32)
# link windows defined socket headers
target_link_libraries(Millennium
Ws2_32.lib
wsock32
Boxer
cpr::cpr
# ${Python_LIBRARIES}
unofficial::git2::git2
)
if (GITHUB_ACTION_BUILD)
Expand All @@ -153,11 +148,9 @@ if(WIN32)
"D:\\a\\Millennium\\Millennium\\Python-3.11.8\\PCbuild\\win32\\python311.lib")
else()
target_link_libraries(Millennium
"C:/Users/Admin/Downloads/Python-3.11.8/Python-3.11.8/PCbuild/win32/python311.lib"
"C:/Users/Admin/Downloads/Python-3.11.8/Python-3.11.8/PCbuild/win32/python311_d.lib"
${CMAKE_SOURCE_DIR}/vendor/python/python311.lib
)
endif()

elseif(UNIX)
target_link_libraries(Millennium
Boxer
Expand Down
2 changes: 1 addition & 1 deletion CMakeUserPresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"strategy": "external"
},
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "C:/Users/Admin/vcpkg/scripts/buildsystems/vcpkg.cmake",
"CMAKE_TOOLCHAIN_FILE": "./vendor/vcpkg/scripts/buildsystems/vcpkg.cmake",
"VCPKG_TARGET_TRIPLET": "x86-windows-static"
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ int main()
EntryMain();
return 1;
}
#endif
#endif

0 comments on commit f67907b

Please sign in to comment.