wip

BlazingRenderer · Aug 24, 2024 · ddd9506 · ddd9506
1 parent d7d1037
commit ddd9506
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,9 +27,9 @@ endif ()
 option(BRENDER_BUILD_DRIVERS "Build Drivers" ON)
 option(BRENDER_BUILD_SOFT "Build Software Renderer" OFF)
 
-if (BRENDER_BUILD_SOFT AND (NOT WIN32 OR NOT MSVC OR (NOT CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")))
-    message(FATAL_ERROR "Can only build the software renderer on 32-bit Windows using MSVC.")
-endif ()
+#if (BRENDER_BUILD_SOFT AND (NOT WIN32 OR NOT MSVC OR (NOT CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")))
+#    message(FATAL_ERROR "Can only build the software renderer on 32-bit Windows using MSVC.")
+#endif ()
 
 add_subdirectory(core)
 

diff --git a/contrib/mkdrv.pl b/contrib/mkdrv.pl
@@ -44,7 +44,7 @@ sub run_h2inc {
 	my (undef, $indir, $infile) = File::Spec->splitpath($inpath);
 
     my @params = (
-        $h2inc, "-nologo", '-G3', '-Zp4', '-w', '-c', '-WIN32',
+        'wine', $h2inc, "-nologo", '-G3', '-Zp4', '-w', '-c', '-WIN32',
         '-D_WIN32',
         '-D__VISUALC', '-D__H2INC__', '-D_NO_PROTOTYPES',
         "-I${incpath}", "-Fa${procpath}", $infile

diff --git a/drivers/pentprim/CMakeLists.txt b/drivers/pentprim/CMakeLists.txt
@@ -136,7 +136,7 @@ endif()
 
 
 
-set_source_files_properties(${ASM_FILES} PROPERTIES COMPILE_OPTIONS "-safeseh")
+set_source_files_properties(${ASM_FILES} PROPERTIES COMPILE_OPTIONS "-q;-safeseh;-Zne;-6;-Zp4;-elf;-zcw")
 
 add_library(pentprim
         awtm.c

diff --git a/drivers/softrend/CMakeLists.txt b/drivers/softrend/CMakeLists.txt
@@ -7,7 +7,7 @@ make_h2inc(softrend "${CMAKE_CURRENT_SOURCE_DIR}/drv.h" "${CMAKE_CURRENT_BINARY_
 set(ASM_FILES
         subdiv.asm
 )
-set_source_files_properties(${ASM_FILES} PROPERTIES COMPILE_OPTIONS "-safeseh")
+set_source_files_properties(${ASM_FILES} PROPERTIES COMPILE_OPTIONS  "-q;-safeseh;-Zne;-6;-Zp4;-elf;-zcw")
 
 add_library(softrend
         alpha.c

diff --git a/flake.nix b/flake.nix
@@ -39,13 +39,19 @@
     packages.x86_64-linux = (mkPackages { system = "x86_64-linux"; }) // {
       brender-samples-win32 = mkCross { crossSystem = nixpkgs.lib.systems.examples.mingw32;  };
       brender-samples-win64 = mkCross { crossSystem = nixpkgs.lib.systems.examples.mingwW64; };
+
+      brender-samples-lin32 = nixpkgs.legacyPackages.x86_64-linux.pkgsi686Linux.callPackage ./default.nix {
+        version = self.lastModifiedDate;
+      };
     };
 
+    packages.i686-linux     = mkPackages { system = "i686-linux"; };
     packages.x86_64-darwin  = mkPackages { system = "x86_64-darwin"; };
     packages.aarch64-linux  = mkPackages { system = "aarch64-linux"; };
     packages.aarch64-darwin = mkPackages { system = "aarch64-darwin"; };
 
     devShells.x86_64-linux   = mkShells self.packages.x86_64-linux;
+    devShells.i686-linux     = mkShells self.packages.i686-linux;
     devShells.aarch64-linux  = mkShells self.packages.aarch64-linux;
     devShells.x86_64-darwin  = mkShells self.packages.x86_64-darwin;
     devShells.aarch64-darwin = mkShells self.packages.aarch64-darwin;
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,7 +136,7 @@ endif() @@
-    set_source_files_properties(${ASM_FILES} PROPERTIES COMPILE_OPTIONS "-safeseh")
+    set_source_files_properties(${ASM_FILES} PROPERTIES COMPILE_OPTIONS "-q;-safeseh;-Zne;-6;-Zp4;-elf;-zcw")
     add_library(pentprim
             awtm.c
@@ Expand Down @@