diff --git a/samples/tetris/build.bat b/samples/tetris/build.bat index dc1d21cadba..d235e7b2f32 100644 --- a/samples/tetris/build.bat +++ b/samples/tetris/build.bat @@ -9,12 +9,11 @@ set MINGW=\msys64\mingw64 set "CFLAGS=-I%MINGW%\include\SDL2" rem Add -Wl,--subsystem,windows for making GUI subsystem application. -set "LFLAGS=%DIR%\Tetris.res -L%MINGW%\lib -lSDL2" +set "LFLAGS=%DIR%\Tetris.res -L%MINGW%\lib -Wl,-Bstatic -lstdc++ -static -lSDL2 -limm32 -lole32 -loleaut32 -lversion -lwinmm -mwindows" call cinterop -def "%DIR%\src\main\c_interop\sdl.def" -compilerOpts "%CFLAGS%" -target "%TARGET%" -o sdl || exit /b rem Windows build requires Windows Resource Compiler in paths. call windres "%DIR%\Tetris.rc" -O coff -o "%DIR%\Tetris.res" || exit /b -call konanc -target "%TARGET%" "%DIR%\src\main\kotlin\Tetris.kt" -library sdl -linkerOpts "%LFLAGS%" -opt -o Tetris || exit /b +call konanc -target "%TARGET%" "%DIR%\src\main\kotlin" -library sdl -linkerOpts "%LFLAGS%" -opt -o Tetris || exit /b -copy %MINGW%\bin\SDL2.dll SDL2.dll copy src\main\resources\tetris_all.bmp tetris_all.bmp diff --git a/samples/tetris/build.gradle b/samples/tetris/build.gradle index a1b208e790e..5ab775ab87f 100644 --- a/samples/tetris/build.gradle +++ b/samples/tetris/build.gradle @@ -78,12 +78,6 @@ compileKonan { from 'src/main/resources' into task.artifact.parentFile } - if (task.name.endsWith('Mingw_x64')) { - copy { - from "${System.getenv("MINGW64_DIR")?:"c:/msys64/mingw64"}/bin/SDL2.dll" - into task.artifact.parentFile - } - } } } } diff --git a/samples/tetris/build.sh b/samples/tetris/build.sh index e553956e8ab..889a93ff2c2 100755 --- a/samples/tetris/build.sh +++ b/samples/tetris/build.sh @@ -44,7 +44,7 @@ mkdir -p $DIR/build/bin/ cinterop -def $DIR/src/main/c_interop/sdl.def -compilerOpts "$CFLAGS" -target $TARGET -o $DIR/build/c_interop/sdl || exit 1 -konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/Tetris.kt \ +konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin \ -library $DIR/build/c_interop/sdl -linkerOpts "$LINKER_ARGS" \ -o $DIR/build/bin/Tetris || exit 1