Initial Posix build #12
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marijnvdwerf
force-pushed
the
posix-build
branch
from
7dbd815
to
7ee9c7a
Compare
IntelOrca
force-pushed
the
posix-build
branch
from
2964563
to
777aac3
Compare
janisozaur
reviewed
Jan 20, 2018
CMakeLists.txt
Outdated
|
|
||
| # Disable optimizations for interop.cpp for all compilers, to allow optimized | ||
| # builds without need for -fno-omit-frame-pointer | ||
| set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/openloco/interop/interop.cpp" PROPERTIES COMPILE_FLAGS -fno-omit-frame-pointer) | ||
|
|
||
| add_executable(${PROJECT} ${ORCT2_SOURCES} ${OLOCO_MM_SOURCES} ${LOCO_SECTIONS}) | ||
| target_compile_definitions(${PROJECT} PRIVATE -D_OPENLOCO_USE_BOOST_FS_) | ||
| target_compile_definitions(${PROJECT} PRIVATE ${OPENLOCO_COMPILE_DEFINITIONS}) |
There was a problem hiding this comment.
This should be of _OPENLOCO_USE_BOOST_FS_=1 form
marijnvdwerf
force-pushed
the
posix-build
branch
from
d7c615e
to
dd47213
Compare
This fixes compilation only, doesn't let it link just yet
This creates appropriate sections, but only uses default linker script for now.
Based on binutils 2.29.1-2
marijnvdwerf
force-pushed
the
posix-build
branch
from
3bbd0bf
to
b569910
Compare
janisozaur
reviewed
Jan 20, 2018
CMakeLists.txt
Outdated
| # include lib | ||
| include_directories("lib/") | ||
| # add source files | ||
| file(GLOB_RECURSE ORCT2_SOURCES "src/*.c" "src/*.cpp" "src/*.h" "src/*.hpp") |
There was a problem hiding this comment.
Victim of copy and paste
janisozaur
force-pushed
the
posix-build
branch
from
7c9705b
to
9b373eb
Compare
janisozaur
reviewed
Jan 20, 2018
CMakeLists.txt
Outdated
| ) | ||
| add_custom_command( | ||
| OUTPUT openloco_data | ||
| COMMAND dd if="${OLOCO_EXE}" of="${OLOCO_DATA}" bs=4096 skip=215 count=78 |
There was a problem hiding this comment.
@marijnvdwerf can you double-check these offsets?
There was a problem hiding this comment.
text start = 0x1000/4096 = 1
text size: 0xd6000/4096 = 214
rodata start: 0xd7000/4096 = 215
rodata+data size: (0x1f000+0x2f000)/4096 = 78
janisozaur
approved these changes
Jan 20, 2018
|
|
marijnvdwerf
added a commit
to marijnvdwerf/OpenLoco
that referenced
this pull request
Feb 21, 2019
Prepare window list to vector refactor
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.