diff --git a/Makefile.win b/Makefile.win index 2a0ee1f..aa6758e 100644 --- a/Makefile.win +++ b/Makefile.win @@ -4,8 +4,8 @@ CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -OBJ = main.o test.o record.o load.o ../pupil_test/save.o setting.o -LINKOBJ = main.o test.o record.o load.o ../pupil_test/save.o setting.o +OBJ = main.o test.o record.o load.o save.o setting.o +LINKOBJ = main.o test.o record.o load.o save.o setting.o LIBS = -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib" -static-libgcc INCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" CXXINCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include/c++" @@ -36,8 +36,8 @@ record.o: record.c load.o: load.c $(CC) -c load.c -o load.o $(CFLAGS) -../pupil_test/save.o: ../pupil_test/save.c - $(CC) -c ../pupil_test/save.c -o ../pupil_test/save.o $(CFLAGS) +save.o: save.c + $(CC) -c save.c -o save.o $(CFLAGS) setting.o: setting.c $(CC) -c setting.c -o setting.o $(CFLAGS) diff --git a/record.c b/record.c index cccaa2e..39c7a4f 100644 --- a/record.c +++ b/record.c @@ -13,8 +13,7 @@ record(int v){ printf("\t\t\t%2d. %-5s %3d分 %5.2f秒\n\n",i+1,dates[dif][i].name,dates[dif][i].scores,dates[dif][i].time); } - printf("\t\t\t按任意键返回菜单"); - getch(); if(voice==1) printf("\a"); + system("pause"); if(voice==1) printf("\a"); system("cls"); } diff --git a/record.o b/record.o index bee1ecf..88fd62e 100644 Binary files a/record.o and b/record.o differ diff --git a/灏忓鐢熸祴楠.exe b/灏忓鐢熸祴楠.exe index 64897d4..2daa242 100644 Binary files a/灏忓鐢熸祴楠.exe and b/灏忓鐢熸祴楠.exe differ diff --git a/灏忓鐢熸祴楠.layout b/灏忓鐢熸祴楠.layout index 406cda8..40d16c1 100644 --- a/灏忓鐢熸祴楠.layout +++ b/灏忓鐢熸祴楠.layout @@ -1,6 +1,6 @@ [Editors] Order=0,1,3,4,5,6,2 -Focused=2 +Focused=3 [Editor_0] CursorCol=4 CursorRow=38 @@ -9,7 +9,7 @@ LeftChar=1 [Editor_1] CursorCol=24 CursorRow=124 -TopLine=154 +TopLine=145 LeftChar=1 [Editor_2] CursorCol=13 @@ -18,7 +18,7 @@ TopLine=1 LeftChar=1 [Editor_3] CursorCol=2 -CursorRow=9 +CursorRow=15 TopLine=1 LeftChar=1 [Editor_4]