fix windows

ucacaxm · Nov 30, 2023 · 0e8ac66 · 0e8ac66
1 parent c380e3a
commit 0e8ac66
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -86,8 +86,8 @@ premake-exec:
 premake-wincb20: remove_quarantine
 	@echo "premake CB20 OS=$(OS)"
 	cp extern/mingw-cb20/bin/*.dll bin
-	$(PREMAKE5) --os=windows --cb-version=cb20 codeblocks
-	$(PREMAKE5) --os=windows --cb-version=cb20 gmake
+	$(PREMAKE5) --os=windows codeblocks
+	$(PREMAKE5) --os=windows gmake
 
 premake-winvs2019: remove_quarantine
 	@echo "premake vs2019 OS=$(OS)"

diff --git a/grapic.lua b/grapic.lua
@@ -80,15 +80,15 @@ solution "grapic"
 
 
 	-- ##################### Windows: CB20 and gmake
-	filter  { "system:windows", "codeblocks"}
+	filter  { "system:windows", "action:codeblocks"}
 		buildoptions { "-std=c++17" }
 		buildoptions { "-g"}
 		linkoptions { "-g"}
 		buildoptions { "-W -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable -Wno-comment -Wno-unused-but-set-variable -Wno-narrowing" }
 		includedirs { "extern/mingw-cb20/include", "extern/mingw-cb20/include/SDL2" }
 		libdirs { grapic_dir .. "/extern/mingw-cb20/lib", grapic_dir .. "/extern/mingw-cb20/bin" }
 		links { "mingw32", "SDL2main", "SDL2", "SDL2_image", "SDL2_ttf" }
-	filter  { "system:windows", "gmake"}
+	filter  { "system:windows", "action:gmake"}
 		buildoptions { "-std=c++17" }
 		buildoptions { "-g"}
 		linkoptions { "-g"}
@@ -100,7 +100,6 @@ solution "grapic"
 
 	-- ##################### Linux
 	filter  { "system:linux" }
-		print("Linux alex")
 		includedirs { "/usr/include/SDL2" }
 		buildoptions { "-std=c++17" }
 		buildoptions { "-ggdb"}

diff --git a/run-lifami-cb20.bat b/run-lifami-cb20.bat
@@ -1,10 +1,10 @@
 
-@echo "==================== del build ===================="
-del /S /Q build
+:: @echo "==================== del build ===================="
+:: del /S /Q build
 
 @echo "==================== premake CB ===================="
-.\script\premake5.exe --os=windows --file=premake5.lua --cb-version=cb20 --lifami codeblocks 
-.\script\premake5.exe --os=windows --file=premake5.lua --cb-version=cb20 --lifami gmake
+.\script\premake5.exe --os=windows --file=premake5.lua --lifami codeblocks 
+.\script\premake5.exe --os=windows --file=premake5.lua --lifami gmake
 
 
 @echo "==================== copy dll =>bin ===================="

diff --git a/run-premake-cb20.bat b/run-premake-cb20.bat
@@ -1,14 +1,14 @@
 
 
-@echo "==================== del build ===================="
-del /S /Q build
+:: @echo "==================== del build ===================="
+:: del /S /Q build
 
 .\script\premake5.exe --version
 
 @echo "==================== premake CB ===================="
-.\script\premake5.exe --os=windows --file=premake5.lua --cb-version=cb20 codeblocks 
+.\script\premake5.exe --os=windows --file=premake5.lua codeblocks 
 @echo "==================== premake gmake ===================="
-.\script\premake5.exe --os=windows --file=premake5.lua --cb-version=cb20 gmake
+.\script\premake5.exe --os=windows --file=premake5.lua gmake
 
 @echo "==================== copy dll =>bin ===================="
 dir