diff --git a/platform/windows/templates-win64/GAS_C/info.template b/platform/windows/templates-win64/GAS_C/info.template index 9c3bba54..c5191189 100644 --- a/platform/windows/templates-win64/GAS_C/info.template +++ b/platform/windows/templates-win64/GAS_C/info.template @@ -19,9 +19,12 @@ UnitCount = 2 [Unit0] Source = utils.s +Source[zh_CN] = utils_zh_CN.s Target = utils.s + [Unit1] Cpp = main.cpp +Cpp[zh_CN] = main.cpp CppName = main.cpp diff --git a/platform/windows/templates/1-WinApp/info.template b/platform/windows/templates/1-WinApp/info.template index 69b8b277..5dbe24d2 100644 --- a/platform/windows/templates/1-WinApp/info.template +++ b/platform/windows/templates/1-WinApp/info.template @@ -11,8 +11,11 @@ Category[zh_CN]=基础 [Unit0] CName=main.c CppName=main.cpp -C=winapp_c.txt -Cpp=winapp_c.txt +C=WinApp_c.txt +Cpp=WinApp_c.txt +C[zh_CN]=WinApp_zh_CN.c +Cpp[zh_CN]=WinApp_zh_CN.c + [Project] UnitCount=1 diff --git a/platform/windows/templates/2-ConsoleApp/ConsoleApp_c.txt b/platform/windows/templates/2-ConsoleApp/ConsoleApp_c.txt index e10d74fc..7ab64218 100644 --- a/platform/windows/templates/2-ConsoleApp/ConsoleApp_c.txt +++ b/platform/windows/templates/2-ConsoleApp/ConsoleApp_c.txt @@ -1,8 +1,6 @@ #include #include -/* run this program using the console pauser or add your own getch, system("pause") or input loop */ - int main(int argc, char *argv[]) { return 0; } \ No newline at end of file diff --git a/platform/windows/templates/2-ConsoleApp/ConsoleApp_cpp.txt b/platform/windows/templates/2-ConsoleApp/ConsoleApp_cpp.txt index 5627b733..06273298 100644 --- a/platform/windows/templates/2-ConsoleApp/ConsoleApp_cpp.txt +++ b/platform/windows/templates/2-ConsoleApp/ConsoleApp_cpp.txt @@ -1,7 +1,5 @@ #include -/* run this program using the console pauser or add your own getch, system("pause") or input loop */ - int main(int argc, char** argv) { return 0; } \ No newline at end of file diff --git a/platform/windows/templates/2-ConsoleApp/info.template b/platform/windows/templates/2-ConsoleApp/info.template index d36ab83b..154718ba 100644 --- a/platform/windows/templates/2-ConsoleApp/info.template +++ b/platform/windows/templates/2-ConsoleApp/info.template @@ -11,8 +11,8 @@ Category[zh_CN]=基础 [Unit0] CName=main.c CppName=main.cpp -C=consoleapp_c.txt -Cpp=consoleapp_cpp.txt +C=ConsoleApp_c.txt +Cpp=ConsoleApp_cpp.txt [Project] UnitCount=1 diff --git a/platform/windows/templates/C_Embed_GAS/info.template b/platform/windows/templates/C_Embed_GAS/info.template index a9e1c108..08b70089 100644 --- a/platform/windows/templates/C_Embed_GAS/info.template +++ b/platform/windows/templates/C_Embed_GAS/info.template @@ -12,7 +12,7 @@ Icon = app.ico [Project] Type = 1 IsCpp = 0 -Encoding = SYSTEM +Encoding = UTF-8 ClassBrowserType = 0 UnitCount = 1 @@ -20,3 +20,4 @@ UnitCount = 1 [Unit0] CName=main.c C=main.c +C[zh_CN]=main_zh_CN.c diff --git a/platform/windows/templates/C_Embed_GAS/main.c b/platform/windows/templates/C_Embed_GAS/main.c index fee19577..0c9f38fa 100644 --- a/platform/windows/templates/C_Embed_GAS/main.c +++ b/platform/windows/templates/C_Embed_GAS/main.c @@ -6,11 +6,11 @@ int add(int x,int y) { "movl %%eax, %1 \n" "addl %%eax, %2 \n" "movl %0, %%eax \n" - :"=m"(result) //output operands used in the instructions - :"m"(x),"m"(y) //input operands used in the instructions + :"=r"(result) //output operands used in the instructions + :"r"(x),"r"(y) //input operands used in the instructions :"eax" //registers changed by the assembler instructions ); - return x+y; + return result; } int main() { diff --git a/platform/windows/templates/epitrochoid/epitrochoid_c.txt b/platform/windows/templates/epitrochoid/epitrochoid_c.txt index 6566b3ad..769cd1c3 100644 --- a/platform/windows/templates/epitrochoid/epitrochoid_c.txt +++ b/platform/windows/templates/epitrochoid/epitrochoid_c.txt @@ -57,7 +57,7 @@ int main() { int newBaseL = GuiSliderBar((Rectangle){ 70, 60, 200, 30 },"Base",TextFormat("%i", (int)baseL), baseL, 1, 50); int newPointL = GuiSliderBar((Rectangle){ 70, 100, 200, 30 },"Point",TextFormat("%i", (int)pointL), pointL, 1, 50); speed = GuiSliderBar((Rectangle){ 70, 150, 200, 30 },"Speed",TextFormat("%i", (int)speed), speed, 1, 50); - GuiLabel((Rectangle){ 20, 220, 80, 30 },TextFormat("Color: 0x%X%X%X ",(int)(trackColor.r), (int)(trackColor.g),(int)(trackColor.b))); + GuiLabel((Rectangle){ 20, 220, 80, 30 },TextFormat("Color: 0x%02X%02X%02X ",(int)(trackColor.r), (int)(trackColor.g),(int)(trackColor.b))); trackColor= GuiColorPicker((Rectangle){ 50, 250, 196, 192 }, NULL, trackColor); int doClear = GuiButton((Rectangle){ 120, 700, 80, 30 },"Clear"); if (newOuterL!=outerL || newBaseL!=baseL || newPointL!=pointL) { diff --git a/platform/windows/templates/epitrochoid/info.template b/platform/windows/templates/epitrochoid/info.template index 43a2b337..ccc5d076 100644 --- a/platform/windows/templates/epitrochoid/info.template +++ b/platform/windows/templates/epitrochoid/info.template @@ -11,10 +11,12 @@ Category[zh_CN]=游戏 [Unit0] CName=main.c C=epitrochoid_c.txt +C[zh_CN]=epitrochoid_zh_CN.c [Project] UnitCount=1 Type=1 IsCpp=0 linker=-lrdrawing -lraylib -lopengl32 -lgdi32 -lwinmm -ExecEncoding=UTF-8 +Encoding = UTF-8 +ExecEncoding = UTF-8