Navigation Menu

Skip to content

Commit

Permalink
make it compile
Browse files Browse the repository at this point in the history
  • Loading branch information
chee committed May 28, 2020
1 parent 83c8f8b commit e12b616
Show file tree
Hide file tree
Showing 18 changed files with 942 additions and 809 deletions.
2 changes: 2 additions & 0 deletions .clang-format
@@ -0,0 +1,2 @@
UseTab: ForIndentation
BreakBeforeBraces: Attach
29 changes: 29 additions & 0 deletions .vscode/c_cpp_properties.json
@@ -0,0 +1,29 @@
{
"configurations": [
{
"name": "NDS",
"forcedInclude": ["${workspaceFolder}/include/vscode_fix.h"],
"includePath": [
"${workspaceFolder}",
"${workspaceFolder}/include/**",
"/opt/devkitpro/libnds/include/**",
"/opt/devkitpro/devkitARM/arm-none-eabi/include/**"
],
"defines": ["_DEBUG", "_UNICODE", "WIN32", "ARM7", "ARM9"],
"browse": {
"path": [
"${workspaceFolder}",
"${workspaceFolder}/include/**",
"/opt/devkitpro/libnds/include/**",
"/opt/devkitpro/devkitARM/arm-none-eabi/include/**"
],
"limitSymbolsToIncludedHeaders": true,
"databaseFilename": ""
},
"cStandard": "c11",
"cppStandard": "c++11",
"compilerPath": "/opt/devkitpro/devkitARM/bin/arm-none-eabi-g++"
}
],
"version": 4
}
32 changes: 32 additions & 0 deletions .vscode/launch.json
@@ -0,0 +1,32 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/${workspaceFolderBasename}.elf",
"targetArchitecture": "arm",
"preLaunchTask": "gdb-debug",
"postDebugTask": "stop-emulation",
"serverLaunchTimeout": 10000,
"stopAtEntry": true,
"cwd": "${workspaceFolder}",
"environment": [],
"externalConsole": true,
"MIMode": "gdb",
"miDebuggerPath": "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gdb",
"miDebuggerServerAddress": "localhost:20000",
"setupCommands": [
{
"description": "Enable pretty-printing",
"text": "file ${workspaceFolder}/${workspaceFolderBasename}.elf -enable-pretty-printing",
"ignoreFailures": true
}
]
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
@@ -0,0 +1,3 @@
{
"C_Cpp.clang_format_fallbackStyle": "{UseTab: ForIndentation}"
}
79 changes: 79 additions & 0 deletions .vscode/tasks.json
@@ -0,0 +1,79 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "make debug",
"type": "process",
"command": "make",
"args": [
"DEBUG=1"
],
"problemMatcher": []
},
{
"label": "make release",
"type": "process",
"command": "make",
"args": [
"DEBUG=0"
],
"problemMatcher": [],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "clean",
"type": "process",
"command": "make",
"args": [
"clean"
],
"problemMatcher": []
},
{
"label": "run",
"type": "shell",
"isBackground": true,
"command": "/usr/games/desmume-cli",
"args": [
"${workspaceFolder}/${workspaceFolderBasename}.nds"
],
"presentation": {
"clear": true,
"reveal": "always"
},
"problemMatcher": []
},
{
"label": "gdb-debug",
"type": "shell",
"dependsOn": [
"make debug"
],
"isBackground": false,
"command": "/usr/games/desmume-cli",
"args": [
"--arm9gdb=20000",
"${workspaceFolder}/${workspaceFolderBasename}.nds"
],
"presentation": {
"clear": true,
"reveal": "always"
},
"problemMatcher": []
},
{
"label": "stop-emulation",
"type": "shell",
"command": "taskkill",
"args": [
"/FI",
"imagename eq DeSmuME*"
],
"problemMatcher": []
}
]
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -10,10 +10,10 @@ include $(DEVKITARM)/ds_rules
export TARGET := $(shell basename $(CURDIR))
export TOPDIR := $(CURDIR)
export GAME_TITLE := prettychips
export GAME_ICON := $(DEVKITPRO)/prettychips.bmp
export GAME_SUBTITLE1 := holy rookies
export GAME_ICON := icon.bmp
export GAME_SUBTITLE1 := love x
export GAME_SUBTITLE2 := chee
ICON := -b $(DEVKITPRO)/prettychips.bmp
ICON := -b icon.bmp

.PHONY: $(TARGET).arm7 $(TARGET).arm9

Expand Down
2 changes: 1 addition & 1 deletion arm7/source/main7.c
Expand Up @@ -65,7 +65,7 @@ int main() {
irqInit();
fifoInit();

int channel = -1;
// int channel = -1;

// read User Settings from firmware
readUserSettings();
Expand Down

0 comments on commit e12b616

Please sign in to comment.