diff --git a/src/gpu/defaultmaterial.lolfx b/src/gpu/defaultmaterial.lolfx new file mode 100644 index 00000000..c325f9c7 --- /dev/null +++ b/src/gpu/defaultmaterial.lolfx @@ -0,0 +1,2 @@ +/* Default material example file */ + diff --git a/src/gpu/emptymaterial.lolfx b/src/gpu/emptymaterial.lolfx new file mode 100644 index 00000000..4b5f0c6e --- /dev/null +++ b/src/gpu/emptymaterial.lolfx @@ -0,0 +1,2 @@ +/* Empty material example file */ + diff --git a/win32/01_triangle.vcxproj b/win32/01_triangle.vcxproj index 9560a9fc..2ae22c13 100644 --- a/win32/01_triangle.vcxproj +++ b/win32/01_triangle.vcxproj @@ -39,17 +39,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/02_cube.vcxproj b/win32/02_cube.vcxproj index b353b27f..5198df1a 100644 --- a/win32/02_cube.vcxproj +++ b/win32/02_cube.vcxproj @@ -39,17 +39,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/03_fractal.vcxproj b/win32/03_fractal.vcxproj index f352785e..619c130c 100644 --- a/win32/03_fractal.vcxproj +++ b/win32/03_fractal.vcxproj @@ -39,17 +39,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/Lol.Config.props b/win32/Lol.Core.Config.props similarity index 97% rename from win32/Lol.Config.props rename to win32/Lol.Core.Config.props index 67c47c6d..6d6fc41f 100644 --- a/win32/Lol.Config.props +++ b/win32/Lol.Core.Config.props @@ -1,16 +1,16 @@ - - - - - true - - - false - true - - - MultiByte - Dynamic - - - + + + + + true + + + false + true + + + MultiByte + Dynamic + + + diff --git a/win32/Lol.Rules.props b/win32/Lol.Core.Rules.props similarity index 98% rename from win32/Lol.Rules.props rename to win32/Lol.Core.Rules.props index 9a093423..5ec45a53 100644 --- a/win32/Lol.Rules.props +++ b/win32/Lol.Core.Rules.props @@ -1,77 +1,77 @@ - - - - true - false - - - - Level3 - true - Fast - $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) - $(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories) - $(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories) - WIN32;$(Win32Defines);%(PreprocessorDefinitions) - WIN32;$(Win32Defines);%(PreprocessorDefinitions) - _XBOX;$(XboxDefines);%(PreprocessorDefinitions) - false - - - Disabled - MultiThreadedDebug - _DEBUG;%(PreprocessorDefinitions) - - - MaxSpeed - MultiThreaded - true - true - Speed - NDEBUG;%(PreprocessorDefinitions) - - - - true - - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies) - $(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories) - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies) - $(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories) - xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies) - xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) - - - true - true - - - - - - set A=$(SdlLibs) - :again - for /f "tokens=1* delims=;" %%I in ("%A%") do ( - if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" && set A=%%J - if not "%%I" == "" goto again - ) - - - - - set A=$(SdlLibs) - :again - for /f "tokens=1* delims=;" %%I in ("%A%") do ( - if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" && set A=%%J - if not "%%I" == "" goto again - ) - - - - - - CopyToHardDrive - - - - + + + + true + false + + + + Level3 + true + Fast + $(SolutionDir)\..\src;%(AdditionalIncludeDirectories) + $(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories) + $(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories) + WIN32;$(Win32Defines);%(PreprocessorDefinitions) + WIN32;$(Win32Defines);%(PreprocessorDefinitions) + _XBOX;$(XboxDefines);%(PreprocessorDefinitions) + false + + + Disabled + MultiThreadedDebug + _DEBUG;%(PreprocessorDefinitions) + + + MaxSpeed + MultiThreaded + true + true + Speed + NDEBUG;%(PreprocessorDefinitions) + + + + true + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies) + $(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies) + $(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories) + xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies) + xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) + + + true + true + + + + + + set A=$(SdlLibs) + :again + for /f "tokens=1* delims=;" %%I in ("%A%") do ( + if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" && set A=%%J + if not "%%I" == "" goto again + ) + + + + + set A=$(SdlLibs) + :again + for /f "tokens=1* delims=;" %%I in ("%A%") do ( + if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" && set A=%%J + if not "%%I" == "" goto again + ) + + + + + + CopyToHardDrive + + + + diff --git a/win32/Lol.Vars.props b/win32/Lol.Core.Vars.props similarity index 98% rename from win32/Lol.Vars.props rename to win32/Lol.Core.Vars.props index c7841966..542184cf 100644 --- a/win32/Lol.Vars.props +++ b/win32/Lol.Core.Vars.props @@ -1,74 +1,74 @@ - - - - - $(SolutionDir)\..\contrib - - - $(ContribDir)\sdl-1.2.14 - $(ContribDir)\sdl-image-1.2.10 - $(ContribDir)\sdl-mixer-1.2.11 - $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include - $(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32 - $(SdlDir)\lib\x86_64-w64-mingw32 - SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib - libSDL.a;libSDLmain.a - - - $(ContribDir)\gtk-2.22.1 - $(ContribDir)\gtkglarea-2.0.1 - $(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include - $(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib - gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib - - - Gdiplus.lib - - - $(ContribDir)\glew-1.7.0 - $(GlewDir)\include\GL - $(GlewDir)\lib\i686-w64-mingw32 - $(GlewDir)\lib\x86_64-w64-mingw32 - opengl32.lib;glew32.lib - - - $(DXSDK_DIR)\Include - $(DXSDK_DIR)\Lib\x86 - $(DXSDK_DIR)\Lib\x64 - d3d9.lib;d3dx9.lib;xinput.lib - d3d9.lib;d3dx9d.lib;xinput.lib - - HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9 - - - - - - $(ContribDir) - $(SdlDir) - $(SdlImageDir) - $(SdlMixerDir) - $(SdlIncludes) - $(SdlLibs) - $(SdlDeps) - $(GtkDir) - $(GtkGlDir) - $(GtkIncludes) - $(GtkLibs) - $(GtkDeps) - $(GdiDeps) - $(GlewDir) - $(GlIncludes) - $(GlLibs) - $(GlDeps) - $(D3d9Includes) - $(D3d9Libs) - $(D3d9Deps) - $(Win32Defines) - $(XboxDefines) - - - $(Platform) $(Configuration)\ - $(Platform) $(Configuration)\$(ProjectName)\ - - + + + + + $(SolutionDir)\..\contrib + + + $(ContribDir)\sdl-1.2.14 + $(ContribDir)\sdl-image-1.2.10 + $(ContribDir)\sdl-mixer-1.2.11 + $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include + $(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32 + $(SdlDir)\lib\x86_64-w64-mingw32 + SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib + libSDL.a;libSDLmain.a + + + $(ContribDir)\gtk-2.22.1 + $(ContribDir)\gtkglarea-2.0.1 + $(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include + $(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib + gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib + + + Gdiplus.lib + + + $(ContribDir)\glew-1.7.0 + $(GlewDir)\include\GL + $(GlewDir)\lib\i686-w64-mingw32 + $(GlewDir)\lib\x86_64-w64-mingw32 + opengl32.lib;glew32.lib + + + $(DXSDK_DIR)\Include + $(DXSDK_DIR)\Lib\x86 + $(DXSDK_DIR)\Lib\x64 + d3d9.lib;d3dx9.lib;xinput.lib + d3d9.lib;d3dx9d.lib;xinput.lib + + HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9 + + + + + + $(ContribDir) + $(SdlDir) + $(SdlImageDir) + $(SdlMixerDir) + $(SdlIncludes) + $(SdlLibs) + $(SdlDeps) + $(GtkDir) + $(GtkGlDir) + $(GtkIncludes) + $(GtkLibs) + $(GtkDeps) + $(GdiDeps) + $(GlewDir) + $(GlIncludes) + $(GlLibs) + $(GlDeps) + $(D3d9Includes) + $(D3d9Libs) + $(D3d9Deps) + $(Win32Defines) + $(XboxDefines) + + + $(Platform) $(Configuration)\ + $(Platform) $(Configuration)\$(ProjectName)\ + + diff --git a/win32/Lol.Fx.props b/win32/Lol.Fx.props new file mode 100644 index 00000000..7e94e845 --- /dev/null +++ b/win32/Lol.Fx.props @@ -0,0 +1,30 @@ + + + + Midl + CustomBuild + + + _SelectedFiles;$(LolFxCompileDependsOn) + + + + @echo off +set D=$(IntDir)%(Filename)%(Extension).cpp +echo /* This file was autogenerated. DO NOT MODIFY IT. */ > "%D%" +echo char const *lolfx_%(Filename) = >> "%D%" +setlocal disabledelayedexpansion +for /F "tokens=1,* delims=`" %%L in ('type "%(Fullpath)"') do ( + set "line=%%L" + setlocal enabledelayedexpansion + echo "!line:"=\"!\n" >> "%D%" + endlocal +) +endlocal +echo ; >> "%D%" + Compiling with Lol Fx Build Rule... + + + diff --git a/win32/Lol.Fx.targets b/win32/Lol.Fx.targets new file mode 100644 index 00000000..2fdf1641 --- /dev/null +++ b/win32/Lol.Fx.targets @@ -0,0 +1,80 @@ + + + + + + LolFxCompile + + + + $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml + + + + + + + + @(LolFxCompile, '|') + + + + + + + + + + + + + + $(ComputeLinkInputsTargets); + ComputeLolFxCompileOutput; + + + $(ComputeLibInputsTargets); + ComputeLolFxCompileOutput; + + + + + + + $(IntDir)\%(FileName).lolfx.cpp + + + + + + + + diff --git a/win32/Lol.Fx.xml b/win32/Lol.Fx.xml new file mode 100644 index 00000000..597fe27c --- /dev/null +++ b/win32/Lol.Fx.xml @@ -0,0 +1,79 @@ + + + + + + + + + + General + + + + + Command Line + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/benchsuite.vcxproj b/win32/benchsuite.vcxproj index 28bed3d5..a1155bc7 100644 --- a/win32/benchsuite.vcxproj +++ b/win32/benchsuite.vcxproj @@ -43,17 +43,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/deushax.vcxproj b/win32/deushax.vcxproj index faac4084..ec8dbbac 100644 --- a/win32/deushax.vcxproj +++ b/win32/deushax.vcxproj @@ -45,17 +45,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/editor.vcxproj b/win32/editor.vcxproj index 25fa1f4e..e1ffd3f0 100644 --- a/win32/editor.vcxproj +++ b/win32/editor.vcxproj @@ -45,15 +45,16 @@ Application Win32Proj - + + - + - + $(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories) @@ -106,5 +107,6 @@ + - \ No newline at end of file + diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj index 40a27550..8fb51f8f 100644 --- a/win32/lolcore.vcxproj +++ b/win32/lolcore.vcxproj @@ -59,13 +59,14 @@ + - + - + _LIB;%(PreprocessorDefinitions) @@ -190,7 +191,12 @@ + + + + + - \ No newline at end of file + diff --git a/win32/lolcore.vcxproj.filters b/win32/lolcore.vcxproj.filters index 47288ee8..40768f20 100644 --- a/win32/lolcore.vcxproj.filters +++ b/win32/lolcore.vcxproj.filters @@ -47,6 +47,9 @@ {a914e15d-3201-467a-a9c9-d7c5244b13ee} + + {3592ed6a-59d7-4a6d-be5a-c05cb5dab730} + @@ -73,99 +76,18 @@ src\platform\sdl - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - src\math - - src - - - src - - - src - - - src - - - src - - - src - src\math - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - src\math src\math - - src - - - src - - - src - src\gpu @@ -211,6 +133,87 @@ src\platform\d3d9 + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + + + src\... + @@ -237,164 +240,172 @@ src\platform\sdl + + src\math + + + src\lol\math + + + src\lol\math + + + src\lol\math + + + src\lol\math + + + src\lol + + + src\gpu + + + src\gpu + + + src\thread + + + src\thread + + + src\application + + + src\image + + + src\platform\xbox + + + src\platform\xbox + + + src\gpu + + + src\lol + + + src\input + + + src\input + + + src\platform\d3d9 + + + src\... + + + src\... + - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src - - - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... - src + src\... + + + src\... - src + src\... - src + src\... - src - - - src\math + src\... - src + src\... - src + src\... - - src - - - src\lol\math - - - src\lol\math - - - src\lol\math - - - src\lol\math - - - src\lol - - - src\gpu - - + + + src\gpu - - - src\thread - - - src\thread - - - src\application - - - src\image - - - src\platform\xbox - - - src\platform\xbox - - + + src\gpu - - - src - - - src\lol - - - src\input - - - src\input - - - src\platform\d3d9 - + \ No newline at end of file diff --git a/win32/lolengine.sln b/win32/lolengine.sln index d4b34b06..82d7aff4 100644 --- a/win32/lolengine.sln +++ b/win32/lolengine.sln @@ -69,6 +69,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -263,5 +265,6 @@ Global {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46} {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601} + {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} EndGlobalSection EndGlobal diff --git a/win32/monsterz.vcxproj b/win32/monsterz.vcxproj index 27313b92..7427c80d 100644 --- a/win32/monsterz.vcxproj +++ b/win32/monsterz.vcxproj @@ -56,17 +56,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/mrpigeon.vcxproj b/win32/mrpigeon.vcxproj index a8a9e01f..e4dd318f 100644 --- a/win32/mrpigeon.vcxproj +++ b/win32/mrpigeon.vcxproj @@ -58,17 +58,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/orbital.vcxproj b/win32/orbital.vcxproj index 81db27bd..fa4bb860 100644 --- a/win32/orbital.vcxproj +++ b/win32/orbital.vcxproj @@ -1,65 +1,67 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - Xbox 360 - - - Release - Win32 - - - Release - x64 - - - Release - Xbox 360 - - - - - - - - - - - - - - - - - - {9e62f2fe-3408-4eae-8238-fd84238ceeda} - - - - {ee203b88-44cf-4859-9d42-7a5f40fecb52} - Application - Win32Proj - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {ee203b88-44cf-4859-9d42-7a5f40fecb52} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/win32/orbital.vcxproj.filters b/win32/orbital.vcxproj.filters index 8292e4c1..b92503b3 100644 --- a/win32/orbital.vcxproj.filters +++ b/win32/orbital.vcxproj.filters @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/quad.vcxproj b/win32/quad.vcxproj index 2dbab670..edcb1e99 100644 --- a/win32/quad.vcxproj +++ b/win32/quad.vcxproj @@ -39,17 +39,19 @@ Application Win32Proj - + + - + - + + - \ No newline at end of file + diff --git a/win32/testsuite.vcxproj b/win32/testsuite.vcxproj index 5c6a1bef..f7032099 100644 --- a/win32/testsuite.vcxproj +++ b/win32/testsuite.vcxproj @@ -50,17 +50,19 @@ Application Win32Proj - + + - + - + +