#353 move the new code to the temporary "src/fixed" folder to make it…

… common for other platforms
XProger · Oct 31, 2021 · 1359050 · 1359050
1 parent 09dd670
commit 1359050
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 23 deletions.
diff --git a/src/platform/gba/camera.h → src/fixed/camera.h b/src/platform/gba/camera.h → src/fixed/camera.h
diff --git a/src/platform/gba/common.cpp → src/fixed/common.cpp b/src/platform/gba/common.cpp → src/fixed/common.cpp
diff --git a/src/platform/gba/common.h → src/fixed/common.h b/src/platform/gba/common.h → src/fixed/common.h
diff --git a/src/platform/gba/draw.h → src/fixed/draw.h b/src/platform/gba/draw.h → src/fixed/draw.h
diff --git a/src/platform/gba/enemy.h → src/fixed/enemy.h b/src/platform/gba/enemy.h → src/fixed/enemy.h
diff --git a/src/platform/gba/game.h → src/fixed/game.h b/src/platform/gba/game.h → src/fixed/game.h
diff --git a/src/platform/gba/inventory.h → src/fixed/inventory.h b/src/platform/gba/inventory.h → src/fixed/inventory.h
diff --git a/src/platform/gba/item.h → src/fixed/item.h b/src/platform/gba/item.h → src/fixed/item.h
diff --git a/src/platform/gba/lara.h → src/fixed/lara.h b/src/platform/gba/lara.h → src/fixed/lara.h
diff --git a/src/platform/gba/level.h → src/fixed/level.h b/src/platform/gba/level.h → src/fixed/level.h
diff --git a/src/platform/gba/nav.h → src/fixed/nav.h b/src/platform/gba/nav.h → src/fixed/nav.h
diff --git a/src/platform/gba/object.h → src/fixed/object.h b/src/platform/gba/object.h → src/fixed/object.h
diff --git a/src/platform/gba/room.h → src/fixed/room.h b/src/platform/gba/room.h → src/fixed/room.h
diff --git a/src/platform/gba/sound.h → src/fixed/sound.h b/src/platform/gba/sound.h → src/fixed/sound.h
diff --git a/src/platform/3do/Makefile b/src/platform/3do/Makefile
@@ -19,7 +19,7 @@ OPT      = -O2
 CFLAGS   = $(OPT) -bi -za1 -zas1 -wn -ff -fa -d __3DO__=1 -cpu ARM6
 CXXFLAGS = $(CFLAGS)
 ASFLAGS	 = -BI -i $(SDK)/include/3do
-INCPATH	 = -I $(SDK)/include/3do -I $(SDK)/include/ttl -I../gba
+INCPATH	 = -I $(SDK)/include/3do -I $(SDK)/include/ttl -I ../../fixed
 LIBPATH	 = $(SDK)/lib
 LDFLAGS	 = -aif -reloc -ro-base 0 -sym $(EXENAME).sym -libpath $(LIBPATH)
 STARTUP	 = $(LIBPATH)/cstartup.o
@@ -44,7 +44,6 @@ OBJ += $(SRC_S:%.s=build/%.s.o)
 OBJ += $(SRC_C:%.c=build/%.c.o)
 OBJ += $(SRC_CXX:%.cpp=build/%.cpp.o)
 OBJ += build/common.cpp.o
-OBJ += build/render.cpp.o
 
 all: clean launchme modbin banner iso run
 
@@ -76,11 +75,8 @@ build/%.c.o: %.c
 build/%.cpp.o: %.cpp
 	$(CXX) $(INCPATH) $(CXXFLAGS) -c $< -o $@
 
-build/common.cpp.o: ../gba/common.cpp
-	$(CXX) $(INCPATH) $(CXXFLAGS) -c ../gba/common.cpp -o build/common.cpp.o
-
-build/render.cpp.o: ../gba/render.cpp
-	$(CXX) $(INCPATH) $(CXXFLAGS) -c ../gba/render.cpp -o build/render.cpp.o
+build/common.cpp.o: ../../fixed/common.cpp
+	$(CXX) $(INCPATH) $(CXXFLAGS) -c ../../fixed/common.cpp -o build/common.cpp.o
 
 clean:
 	$(RM) -vf $(OBJ) $(EXENAME) $(EXENAME).sym $(ISONAME)

diff --git a/src/platform/gba/Makefile b/src/platform/gba/Makefile
@@ -22,8 +22,8 @@ include $(DEVKITARM)/gba_rules
 #---------------------------------------------------------------------------------
 TARGET		:= OpenLara
 BUILD		:= build
-SOURCES		:= .
-INCLUDES	:= include
+SOURCES		:= ../../fixed .
+INCLUDES	:= include . ../../fixed
 DATA		:= data
 MUSIC		:=
 LIBTONC		:= $(DEVKITPRO)/libtonc

diff --git a/src/platform/gba/OpenLara.vcxproj b/src/platform/gba/OpenLara.vcxproj
@@ -19,26 +19,26 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="common.cpp" />
+    <ClCompile Include="..\..\fixed\common.cpp" />
     <ClCompile Include="main.cpp" />
-    <ClInclude Include="nav.h" />
     <ClCompile Include="render.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="camera.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="draw.h" />
-    <ClInclude Include="enemy.h" />
-    <ClInclude Include="game.h" />
-    <ClInclude Include="inventory.h" />
-    <ClInclude Include="item.h" />
-    <ClInclude Include="lara.h" />
-    <ClInclude Include="level.h" />
-    <ClInclude Include="object.h" />
+    <ClInclude Include="..\..\fixed\camera.h" />
+    <ClInclude Include="..\..\fixed\common.h" />
+    <ClInclude Include="..\..\fixed\draw.h" />
+    <ClInclude Include="..\..\fixed\enemy.h" />
+    <ClInclude Include="..\..\fixed\game.h" />
+    <ClInclude Include="..\..\fixed\inventory.h" />
+    <ClInclude Include="..\..\fixed\item.h" />
+    <ClInclude Include="..\..\fixed\lara.h" />
+    <ClInclude Include="..\..\fixed\level.h" />
+    <ClInclude Include="..\..\fixed\nav.h" />
+    <ClInclude Include="..\..\fixed\object.h" />
+    <ClInclude Include="..\..\fixed\room.h" />
+    <ClInclude Include="..\..\fixed\sound.h" />
     <ClInclude Include="rasterizer_mode13.h" />
     <ClInclude Include="rasterizer_mode4.h" />
-    <ClInclude Include="room.h" />
-    <ClInclude Include="sound.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
@@ -94,15 +94,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>..\..\fixed;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>..\..\fixed;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <IncludePath>..\..\fixed;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <IncludePath>..\..\fixed;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>