Apple-2-SW/qasm
1
0
Fork 0
mirror of https://github.com/marketideas/qasm.git synced 2024-12-28 06:29:58 +00:00
Code Issues Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
marketideas 2019-11-16 18:27:19 -08:00
parent 96ae01d615
commit 02bdd29e79
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -3,6 +3,8 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
project(QAsm) project(QAsm)
set(CIDER "0")
set(CMAKE_BUILD_TYPE DEBUG) set(CMAKE_BUILD_TYPE DEBUG)
set(APPVERSION "4.0.9") set(APPVERSION "4.0.9")
set(LIBRARY_NAME pal) set(LIBRARY_NAME pal)
@ -22,30 +24,39 @@ set(SOURCE
#find_package(OpenSSL REQUIRED) #find_package(OpenSSL REQUIRED)
find_package( Poco REQUIRED Foundation Util XML JSON ) find_package( Poco REQUIRED Foundation Util XML JSON )
find_package( ZLIB )
include_directories(BEFORE include_directories(BEFORE
${PROJECT_ROOT} ${PROJECT_ROOT}
${PROJECT_ROOT}/lib${LIBRARY_NAME}/include/${LIBRARY_NAME} ${PROJECT_ROOT}/lib${LIBRARY_NAME}/include/${LIBRARY_NAME}
${PROJECT_ROOT}/ciderpress/diskimg
#${OPENSSL_INCLUDE_DIR} #${OPENSSL_INCLUDE_DIR}
${Poco_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS}
) )
include(${PROJECT_ROOT}/lib${LIBRARY_NAME}/cmake/CMakeApp.txt)
set (CIDERLIBS "" )
if ( ${CIDER} )
add_definitions(-DCIDERPRESS)
include_directories(AFTER ${PROJECT_ROOT}/ciderpress/diskimg)
add_subdirectory(${PROJECT_ROOT}/ciderpress/nufxlib) add_subdirectory(${PROJECT_ROOT}/ciderpress/nufxlib)
add_subdirectory(${PROJECT_ROOT}/ciderpress/diskimg) add_subdirectory(${PROJECT_ROOT}/ciderpress/diskimg)
add_subdirectory(${PROJECT_ROOT}/lib${LIBRARY_NAME}) find_library(DISKIMG_LIB libnufx_static.a ${PROJECT_ROOT}/build )
find_library(HFS_LIB libnufx_static.a ${PROJECT_ROOT}/build )
find_library(NUFX_LIB libnufx_static.a ${PROJECT_ROOT}/build )
set (CIDERLIBS diskimg_static hfs_static nufx_static ${ZLIB_LIBRARIES})
endif ( ${CIDER} )
include(${PROJECT_ROOT}/lib${LIBRARY_NAME}/cmake/CMakeApp.txt) add_subdirectory(${PROJECT_ROOT}/lib${LIBRARY_NAME})
add_executable( ${PROJECT_NAME} ${SOURCE}) add_executable( ${PROJECT_NAME} ${SOURCE})
#link_directories( ${link_directories} ./build/ciderpress/diskimg
target_link_libraries ( target_link_libraries (
${PROJECT_NAME} ${PROJECT_NAME}
${LIBRARY_NAME} ${LIBRARY_NAME}
pthread pthread
${PROJECT_ROOT}/ciderpress/diskimg ${CIDERLIBS}
${Poco_LIBRARIES} ${Poco_LIBRARIES}
) )

10
qasm.cpp
View File

@ -1,6 +1,8 @@
#include "app.h" #include "app.h"
#include "asm.h" #include "asm.h"
#ifdef CIDERPRESS
#include "DiskImg.h" #include "DiskImg.h"
#endif
#define CLASS PAL_APPCLASS #define CLASS PAL_APPCLASS
@ -29,6 +31,14 @@ void CLASS::displayVersion()
s = "-debug"; s = "-debug";
#endif #endif
cerr << "quickASM 16++ v" << (std::string)STRINGIFY(APPVERSION) << s << endl; cerr << "quickASM 16++ v" << (std::string)STRINGIFY(APPVERSION) << s << endl;
#ifdef CIDERPRESS
DiskImgLib::Global::AppInit();
DiskImgLib::DiskImg prodos;
DiskImgLib::Global::AppCleanup();
#endif
} }
int CLASS::runServerApp(PAL_EVENTMANAGER *em) int CLASS::runServerApp(PAL_EVENTMANAGER *em)