mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-11-04 00:45:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(go): Remove remaining references to go4k.

Browse Source
This commit is contained in:
Veikko Sariola
2020-12-16 21:39:23 +02:00
parent 224b8dcb70
commit e6feed1e26
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -27,4 +27,4 @@ build32/
build64/ build64/
out/ out/
.cache/ .cache/
go4k/actual_output/ actual_output/

6
CHANGELOG.md
View File

@ -18,8 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Switch to CMake for builds. - Switch to CMake for builds.
- Compiling as a static library & an API to call Sointu - Compiling as a static library & an API to call Sointu
- Running all tests (win/linux/mac) in the cloud, using Github workflows - Running all tests (win/linux/mac) in the cloud, using Github workflows
- go4k: a Go package to call Sointu - go: a Go package to call Sointu
- go4k: Importing and exporting Sointu .asm songs - go: Importing and exporting Sointu .asm songs
- go4k: asmfmt, a command line utility to format/process Sointu .asm song files - go: asmfmt, a command line utility to format/process Sointu .asm song files
[Unreleased]: https://github.com/vsariola/sointu/compare/4klang-3.11...HEAD [Unreleased]: https://github.com/vsariola/sointu/compare/4klang-3.11...HEAD

8
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
# This policy is needed so that we can set the MSVC_RUNTIME to statically linked # This policy is needed so that we can set the MSVC_RUNTIME to statically linked
# i.e. set_property(TARGET 4klang PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # i.e. set_property(TARGET 4klang PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
cmake_policy(SET CMP0091 NEW) cmake_policy(SET CMP0091 NEW)
project(sointu project(sointu
VERSION 0.0.0 VERSION 0.0.0
@ -42,7 +42,7 @@ endif()
# the tests include the entire ASM but we still want to rebuild when they change # the tests include the entire ASM but we still want to rebuild when they change
file(GLOB templates ${PROJECT_SOURCE_DIR}/templates/*.asm) file(GLOB templates ${PROJECT_SOURCE_DIR}/templates/*.asm)
file(GLOB go4k "${PROJECT_SOURCE_DIR}/*.go" "${PROJECT_SOURCE_DIR}/cmd/sointu-cli/*.go") file(GLOB sointu "${PROJECT_SOURCE_DIR}/*.go" "${PROJECT_SOURCE_DIR}/cmd/sointu-cli/*.go")
file(GLOB compilersrc "${PROJECT_SOURCE_DIR}/compiler/*.go") file(GLOB compilersrc "${PROJECT_SOURCE_DIR}/compiler/*.go")
if(DEFINED CMAKE_C_SIZEOF_DATA_PTR AND CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) if(DEFINED CMAKE_C_SIZEOF_DATA_PTR AND CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
@ -57,10 +57,10 @@ endif()
set(STATICLIB sointu) set(STATICLIB sointu)
set(sointuasm sointu.asm) set(sointuasm sointu.asm)
add_custom_command( add_custom_command(
OUTPUT ${sointuasm} OUTPUT ${sointuasm}
COMMAND go run ${PROJECT_SOURCE_DIR}/compiler/generate.go -arch=${arch} ${CMAKE_CURRENT_BINARY_DIR} COMMAND go run ${PROJECT_SOURCE_DIR}/compiler/generate.go -arch=${arch} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS "${templates}" "${go4k}" "${compilersrc}" DEPENDS "${templates}" "${sointu}" "${compilersrc}"
) )
add_library(${STATICLIB} ${sointuasm}) add_library(${STATICLIB} ${sointuasm})