this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Work on compiling Rez

+25 -72
+22 -55
src/buildtools/Rez/CMakeLists.txt
··· 15 15 # You should have received a copy of the GNU General Public License 16 16 # along with Retro68. If not, see <http://www.gnu.org/licenses/>. 17 17 18 - find_package(Boost COMPONENTS wave filesystem system thread regex program_options) 19 - 20 18 # Look for bison. 21 - # We need Version 3, and Mac OS X still comes with an outdated version (2.3). 22 - # So we just add the path where the homebrew package manager installs its 23 - # "keg-only" version. Shouldn't hurt on Linux. 24 - set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} "/usr/local/opt/bison/bin") 25 - find_package(BISON 3.0.2) 19 + find_package(BISON) 26 20 27 - if(NOT Boost_FOUND) 28 - message(FATAL_ERROR "The boost libraries have not been found.") 29 - endif() 21 + find_package(Boost REQUIRED COMPONENTS wave filesystem system thread regex program_options) 30 22 31 - if(NOT BISON_FOUND) 32 - message(FATAL_ERROR "GNU Bison version 3.0.2 or later is required.") 33 - endif() 23 + include_directories( 24 + ${CMAKE_CURRENT_SOURCE_DIR} 25 + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceFiles 26 + ${CMAKE_CURRENT_BINARY_DIR} 27 + ${Boost_INCLUDE_DIR} 28 + ) 34 29 35 - include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) 30 + add_subdirectory(ResourceFiles) 36 31 37 - set(BISON_OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.hh 38 - ${CMAKE_CURRENT_BINARY_DIR}/location.hh ${CMAKE_CURRENT_BINARY_DIR}/position.hh 39 - ${CMAKE_CURRENT_BINARY_DIR}/stack.hh) 32 + BISON_TARGET(RezParser RezParser.yy ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc) 40 33 41 - add_custom_command(OUTPUT ${BISON_OUTPUTS} 42 - COMMAND ${BISON_EXECUTABLE} 43 - ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc RezParser.yy 44 - DEPENDS RezParser.yy 45 - COMMENT "[BISON][RezParser] Building parser with bison ${BISON_VERSION}" 46 - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) 34 + add_executable(Rez 35 + ${CMAKE_CURRENT_BINARY_DIR}/RezParser.generated.cc 47 36 37 + RezLexer.cc 38 + RezLexerNextToken.cc 48 39 49 - add_library(RezLib 50 - RezParser.yy 51 - ${BISON_OUTPUTS} 52 - 53 - RezLexer.h 54 - RezLexer.cc 55 - RezLexerWaveToken.h 56 - RezLexerNextToken.cc 57 - 58 - RezWorld.cc 59 - RezWorld.h 60 - 61 - ResourceDefinitions.cc 62 - ResourceDefinitions.h 63 - 64 - Expression.cc 65 - Expression.h 66 - 67 - ResourceCompiler.cc 68 - ResourceCompiler.h 40 + RezWorld.cc 69 41 70 - ResSpec.h 42 + ResourceDefinitions.cc 71 43 72 - Diagnostic.h Diagnostic.cc 73 - ) 74 - target_link_libraries(RezLib ResourceFiles ${Boost_LIBRARIES}) 75 - target_include_directories(RezLib PRIVATE ${Boost_INCLUDE_DIR}) 44 + Expression.cc 76 45 77 - add_executable(Rez 78 - Rez.cc 79 - ) 80 - target_link_libraries(Rez RezLib ResourceFiles ${Boost_LIBRARIES}) 81 - target_include_directories(Rez PRIVATE ${Boost_INCLUDE_DIR}) 46 + ResourceCompiler.cc 47 + Diagnostic.cc 48 + Rez.cc 49 + ) 82 50 83 - install(TARGETS Rez RUNTIME DESTINATION bin) 51 + target_link_libraries(Rez $<TARGET_OBJECTS:ResourceFiles> ${Boost_LIBRARIES}) 84 52 85 - add_subdirectory(Test)
+1 -15
src/buildtools/Rez/ResourceFiles/CMakeLists.txt
··· 15 15 # You should have received a copy of the GNU General Public License 16 16 # along with Retro68. If not, see <http://www.gnu.org/licenses/>. 17 17 18 - find_package(Boost COMPONENTS filesystem system REQUIRED) 19 - 20 - add_library(ResourceFiles 18 + add_library(ResourceFiles OBJECT 21 19 ResourceFork.h ResourceFork.cc 22 20 BinaryIO.h BinaryIO.cc 23 21 ResType.h ResType.cc 24 22 ResourceFile.h ResourceFile.cc 25 23 ) 26 24 27 - target_link_libraries(ResourceFiles ${Boost_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib/libhfs.a) 28 - target_include_directories(ResourceFiles PUBLIC . 29 - PRIVATE ${CMAKE_INSTALL_PREFIX}/include 30 - ${Boost_INCLUDE_DIR}) 31 - 32 - find_package(Boost COMPONENTS program_options REQUIRED) 33 - 34 - add_executable(ResInfo ResInfo.cc) 35 - target_link_libraries(ResInfo ResourceFiles ${Boost_LIBRARIES}) 36 - target_include_directories(ResInfo PRIVATE ${Boost_INCLUDE_DIR}) 37 - 38 - install(TARGETS ResInfo RUNTIME DESTINATION bin)
+2 -2
src/buildtools/Rez/ResourceFiles/ResourceFile.cc
··· 515 515 longword(out, 32); 516 516 } 517 517 break; 518 - 518 + #ifndef DARLING 519 519 case Format::diskimage: 520 520 { 521 521 std::ostringstream rsrcOut; ··· 545 545 546 546 } 547 547 break; 548 - 548 + #endif 549 549 default: 550 550 return false; 551 551 }